summaryrefslogtreecommitdiffstats
path: root/kicker/applets/systemtray/systemtrayapplet.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kicker/applets/systemtray/systemtrayapplet.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/systemtray/systemtrayapplet.cpp')
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index d10fd107e..02f13df2b 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -296,7 +296,7 @@ void SystemTrayApplet::applySettings()
m_showClockInTray = m_showClockSettingCB->isChecked();
- KConfig *conf = config();
+ TDEConfig *conf = config();
// Save the sort order and hidden status using the window class (WM_CLASS) rather
// than window name (caption) - window name is i18n-ed, so it's for example
@@ -485,7 +485,7 @@ void SystemTrayApplet::loadSettings()
setFrameStyle(NoFrame);
m_showFrame = KickerSettings::showDeepButtons()?true:false;
- KConfig *conf = config();
+ TDEConfig *conf = config();
conf->reparseConfiguration();
conf->setGroup("General");