Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 7ff7bcc7ea
commit 8c0ea4fa2a

@ -648,10 +648,10 @@ bool KviApp::findLocalKvircDirectory()
#ifdef COMPILE_TDE_SUPPORT #ifdef COMPILE_TDE_SUPPORT
if(m_szConfigFile.isEmpty()) if(m_szConfigFile.isEmpty())
{ // don't do that if user supplied a config file :) { // don't do that if user supplied a config file :)
KConfig * cfg = config(); TDEConfig * cfg = config();
if(cfg) if(cfg)
{ {
if(cfg->getConfigState() == KConfig::ReadWrite) if(cfg->getConfigState() == TDEConfig::ReadWrite)
{ {
cfg->setGroup("Main"); cfg->setGroup("Main");
m_szLocalKvircDir = cfg->readEntry("LocalKvircDirectory",""); m_szLocalKvircDir = cfg->readEntry("LocalKvircDirectory","");
@ -824,10 +824,10 @@ void KviApp::saveKvircDirectory()
// In KDE we use the application config file // In KDE we use the application config file
if(m_szConfigFile.isEmpty()) if(m_szConfigFile.isEmpty())
{ // not if user supplied a config file { // not if user supplied a config file
KConfig * cfg = config(); TDEConfig * cfg = config();
if(cfg) if(cfg)
{ {
if(cfg->getConfigState() == KConfig::ReadWrite) if(cfg->getConfigState() == TDEConfig::ReadWrite)
{ {
cfg->setGroup("Main"); cfg->setGroup("Main");
cfg->writeEntry("LocalKvircDirectory",m_szLocalKvircDir); cfg->writeEntry("LocalKvircDirectory",m_szLocalKvircDir);

Loading…
Cancel
Save