summaryrefslogtreecommitdiffstats
path: root/tdecore/kiconloader.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/kiconloader.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/kiconloader.cpp')
-rw-r--r--tdecore/kiconloader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 01aaa84fd..127f8eaba 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -214,8 +214,8 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
// These have to match the order in kicontheme.h
static const char * const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", "Panel", 0L };
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cs(config, "dummy");
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cs(config, "dummy");
// loading config and default sizes
d->mpGroups = new KIconGroup[(int) KIcon::LastGroup];