summaryrefslogtreecommitdiffstats
path: root/tdecore/kglobal.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdecore/kglobal.cpp
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kglobal.cpp')
-rw-r--r--tdecore/kglobal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index c51f13e7f..9759edbcf 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -60,7 +60,7 @@ KStandardDirs *TDEGlobal::dirs()
return _instance->dirs();
}
-KConfig *TDEGlobal::config()
+TDEConfig *TDEGlobal::config()
{
MYASSERT(_instance);