summaryrefslogtreecommitdiffstats
path: root/kicker/extensions/dockbar
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/extensions/dockbar
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/extensions/dockbar')
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 71160cbe6..393e9a2d6 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -273,7 +273,7 @@ void DockBarExtension::settingsChanged(DockContainer *)
void DockBarExtension::saveContainerConfig()
{
TQStringList applet_list;
- KConfig *conf = config();
+ TDEConfig *conf = config();
unsigned count = 0;
for (DockContainer::Vector::const_iterator it = containers.constBegin();
@@ -300,7 +300,7 @@ void DockBarExtension::saveContainerConfig()
void DockBarExtension::loadContainerConfig()
{
- KConfig *conf = config();
+ TDEConfig *conf = config();
conf->setGroup("General");
TQStringList applets = conf->readListEntry("Applets");