summaryrefslogtreecommitdiffstats
path: root/kicker-applets/mediacontrol
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:28:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:28:24 -0600
commit20de04ce44f63fb911103d7870d39d2782d14cda (patch)
treebddd13cef2fae98892caf538dc64b5357732c517 /kicker-applets/mediacontrol
parent4c097708c4cc24f3b8e4c21f14644f5715767d47 (diff)
downloadtdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.tar.gz
tdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/mediacontrol')
-rw-r--r--kicker-applets/mediacontrol/configfrontend.cpp4
-rw-r--r--kicker-applets/mediacontrol/configfrontend.h4
-rw-r--r--kicker-applets/mediacontrol/mediacontrolconfig.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/kicker-applets/mediacontrol/configfrontend.cpp b/kicker-applets/mediacontrol/configfrontend.cpp
index 971d4d5..7bebd50 100644
--- a/kicker-applets/mediacontrol/configfrontend.cpp
+++ b/kicker-applets/mediacontrol/configfrontend.cpp
@@ -23,7 +23,7 @@
ConfigFrontend::ConfigFrontend() : TQObject(0, 0)
{
- _config = new KConfig(TQString(), true, false);
+ _config = new TDEConfig(TQString(), true, false);
_ownConfig = true;
}
@@ -35,7 +35,7 @@ ConfigFrontend::~ConfigFrontend()
}
}
-ConfigFrontend::ConfigFrontend(KConfig *config) : TQObject(0, 0)
+ConfigFrontend::ConfigFrontend(TDEConfig *config) : TQObject(0, 0)
{
_config = config;
_config->setGroup("MediaControl");
diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h
index 9a4727f..30d0166 100644
--- a/kicker-applets/mediacontrol/configfrontend.h
+++ b/kicker-applets/mediacontrol/configfrontend.h
@@ -30,7 +30,7 @@ class ConfigFrontend : public TQObject
public:
ConfigFrontend();
- ConfigFrontend(KConfig *);
+ ConfigFrontend(TDEConfig *);
virtual ~ConfigFrontend();
uint mouseWheelSpeed() const;
@@ -46,7 +46,7 @@ class ConfigFrontend : public TQObject
void reparseConfiguration() { _config->reparseConfiguration(); }
private:
- KConfig *_config;
+ TDEConfig *_config;
bool _ownConfig:1;
};
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.h b/kicker-applets/mediacontrol/mediacontrolconfig.h
index aad3c61..0d020c1 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.h
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.h
@@ -23,7 +23,7 @@
class MediaControlConfigWidget;
class ConfigFrontend;
-class KConfig;
+class TDEConfig;
class MediaControlConfig: public KDialogBase
{