From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:30:47 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kcontrol/xinerama/kcmxinerama.cpp | 8 ++++----
 kcontrol/xinerama/kcmxinerama.h   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kcontrol/xinerama')

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;
-- 
cgit v1.2.1