summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:13:05 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:13:05 -0600
commit8c0ea4fa2a208ba5079da31ba8e1c86980946752 (patch)
tree8e64785fc4e68e35e6d290ff24783a1fba27a872
parent7ff7bcc7ea84846c0e4dd51a4589300aea74acf5 (diff)
downloadkvirc-8c0ea4fa2a208ba5079da31ba8e1c86980946752.tar.gz
kvirc-8c0ea4fa2a208ba5079da31ba8e1c86980946752.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--src/kvirc/kernel/kvi_app_setup.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 65090d18..e2d05141 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -648,10 +648,10 @@ bool KviApp::findLocalKvircDirectory()
#ifdef COMPILE_TDE_SUPPORT
if(m_szConfigFile.isEmpty())
{ // don't do that if user supplied a config file :)
- KConfig * cfg = config();
+ TDEConfig * cfg = config();
if(cfg)
{
- if(cfg->getConfigState() == KConfig::ReadWrite)
+ if(cfg->getConfigState() == TDEConfig::ReadWrite)
{
cfg->setGroup("Main");
m_szLocalKvircDir = cfg->readEntry("LocalKvircDirectory","");
@@ -824,10 +824,10 @@ void KviApp::saveKvircDirectory()
// In KDE we use the application config file
if(m_szConfigFile.isEmpty())
{ // not if user supplied a config file
- KConfig * cfg = config();
+ TDEConfig * cfg = config();
if(cfg)
{
- if(cfg->getConfigState() == KConfig::ReadWrite)
+ if(cfg->getConfigState() == TDEConfig::ReadWrite)
{
cfg->setGroup("Main");
cfg->writeEntry("LocalKvircDirectory",m_szLocalKvircDir);