summaryrefslogtreecommitdiffstats
path: root/kcontrol/xinerama
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/xinerama
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/xinerama')
-rw-r--r--kcontrol/xinerama/kcmxinerama.cpp8
-rw-r--r--kcontrol/xinerama/kcmxinerama.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index 607cd8754..9d1819223 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -41,7 +41,7 @@
KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
- : KCModule(parent, name) {
+ : TDECModule(parent, name) {
_indicators.setAutoDelete(true);
TDEAboutData *about =
@@ -56,8 +56,8 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
setQuickHelp( i18n("<h1>Multiple Monitors</h1> This module allows you to configure TDE support"
" for multiple monitors."));
- config = new KConfig("kdeglobals", false, false);
- ksplashrc = new KConfig("ksplashrc", false, false);
+ config = new TDEConfig("kdeglobals", false, false);
+ ksplashrc = new TDEConfig("ksplashrc", false, false);
connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearIndicator()));
@@ -239,7 +239,7 @@ void KCMXinerama::clearIndicator() {
}
extern "C" {
- KDE_EXPORT KCModule *create_xinerama(TQWidget *parent, const char *name) {
+ KDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) {
TDEGlobal::locale()->insertCatalogue("kcmxinerama");
return new KCMXinerama(parent, name);
}
diff --git a/kcontrol/xinerama/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h
index 130fae78e..707bba28c 100644
--- a/kcontrol/xinerama/kcmxinerama.h
+++ b/kcontrol/xinerama/kcmxinerama.h
@@ -27,10 +27,10 @@
#include "xineramawidget.h"
-class KConfig;
+class TDEConfig;
class TQWidget;
-class KCMXinerama : public KCModule {
+class KCMXinerama : public TDECModule {
Q_OBJECT
public:
KCMXinerama(TQWidget *parent = 0L, const char *name = 0L);
@@ -49,7 +49,7 @@ public slots:
private:
TQWidget* indicator(int dpy);
- KConfig *config, *ksplashrc;
+ TDEConfig *config, *ksplashrc;
XineramaWidget *xw;
TQTimer _timer;
TQPtrList<TQWidget> _indicators;