summaryrefslogtreecommitdiffstats
path: root/tdeui/ksystemtray.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:35:07 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdeui/ksystemtray.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 'tdeui/ksystemtray.cpp')
-rw-r--r--tdeui/ksystemtray.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index e24fde38a..717d5c574 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -314,8 +314,8 @@ KActionCollection* KSystemTray::actionCollection()
TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance )
{
- KConfig *appCfg = kapp->config();
- KConfigGroupSaver configSaver(appCfg, "System Tray");
+ TDEConfig *appCfg = kapp->config();
+ TDEConfigGroupSaver configSaver(appCfg, "System Tray");
int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
}