From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:43:14 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 twin/kcmtwin/twinoptions/main.cpp    | 12 ++++++------
 twin/kcmtwin/twinoptions/mouse.cpp   |  8 ++++----
 twin/kcmtwin/twinoptions/windows.cpp |  4 ++--
 twin/kcmtwin/twinoptions/windows.h   |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'twin/kcmtwin/twinoptions')

diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 5b193ed5f..3c072996b 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -39,7 +39,7 @@ extern "C"
 	KDE_EXPORT KCModule *create_twinfocus(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
-		KGlobal::locale()->insertCatalogue("kcmkwm");
+		TDEGlobal::locale()->insertCatalogue("kcmkwm");
 		KConfig *c = new KConfig("twinrc", false, true);
 		return new KFocusConfig(true, c, parent, name);
 	}
@@ -47,14 +47,14 @@ extern "C"
 	KDE_EXPORT KCModule *create_twinactions(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
-		KGlobal::locale()->insertCatalogue("kcmkwm");
+		TDEGlobal::locale()->insertCatalogue("kcmkwm");
 		return new KActionsOptions( parent, name);
 	}
 
 	KDE_EXPORT KCModule *create_twinmoving(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
-		KGlobal::locale()->insertCatalogue("kcmkwm");
+		TDEGlobal::locale()->insertCatalogue("kcmkwm");
 		KConfig *c = new KConfig("twinrc", false, true);
 		return new KMovingConfig(true, c, parent, name);
 	}
@@ -62,7 +62,7 @@ extern "C"
 	KDE_EXPORT KCModule *create_twinadvanced(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
-		KGlobal::locale()->insertCatalogue("kcmkwm");
+		TDEGlobal::locale()->insertCatalogue("kcmkwm");
 		KConfig *c = new KConfig("twinrc", false, true);
 		return new KAdvancedConfig(true, c, parent, name);
 	}
@@ -70,7 +70,7 @@ extern "C"
 	KDE_EXPORT KCModule *create_twintranslucency(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
-		KGlobal::locale()->insertCatalogue("kcmkwm");
+		TDEGlobal::locale()->insertCatalogue("kcmkwm");
 		KConfig *c = new KConfig("twinrc", false, true);
 		return new KTranslucencyConfig(true, c, parent, name);
 	}
@@ -78,7 +78,7 @@ extern "C"
 	KDE_EXPORT KCModule *create_twinoptions ( TQWidget *parent, const char* name)
 	{
 		//CT there's need for decision: kwm or twin?
-		KGlobal::locale()->insertCatalogue("kcmkwm");
+		TDEGlobal::locale()->insertCatalogue("kcmkwm");
 		return new KWinOptions( parent, name);
 	}
 }
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 077df2ee4..76b4ba2f9 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -109,8 +109,8 @@ void createMaxButtonPixmaps()
     "..............."},
   };
 
-  TQString baseColor(". c " + KGlobalSettings::baseColor().name());
-  TQString textColor("# c " + KGlobalSettings::textColor().name());
+  TQString baseColor(". c " + TDEGlobalSettings::baseColor().name());
+  TQString textColor("# c " + TDEGlobalSettings::textColor().name());
   for (int t = 0; t < 3; ++t)
   {
     maxButtonXpms[t][0] = "15 13 2 1";
@@ -143,7 +143,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
   TQString strMouseButton1, strMouseButton3, strMouseWheel;
   TQString txtButton1, txtButton3, txtButton4;
   TQStringList items;
-  bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
+  bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded);
 
 /** Titlebar doubleclick ************/
 
@@ -595,7 +595,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
   TQString strMouseButton1, strMouseButton3;
   TQString txtButton1, txtButton3;
   TQStringList items;
-  bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
+  bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded);
 
 /**  Inactive inner window ******************/
 
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index f7b5780b7..fd2152db2 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -1708,9 +1708,9 @@ void KTranslucencyConfig::defaults()
 bool KTranslucencyConfig::kompmgrAvailable()
 {
     bool ret;
-    KProcess proc;
+    TDEProcess proc;
     proc << "kompmgr" << "-v";
-    ret = proc.start(KProcess::DontCare, KProcess::AllOutput);
+    ret = proc.start(TDEProcess::DontCare, TDEProcess::AllOutput);
     proc.detach();
     return ret;
 }
diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h
index cbce12676..4c6290a4e 100644
--- a/twin/kcmtwin/twinoptions/windows.h
+++ b/twin/kcmtwin/twinoptions/windows.h
@@ -238,7 +238,7 @@ private:
   TQCheckBox* hideUtilityWindowsForInactive;
 };
 
-class KProcess;
+class TDEProcess;
 class KTranslucencyConfig : public KCModule
 {
   Q_OBJECT
@@ -289,7 +289,7 @@ private:
   void startKompmgr();
   void stopKompmgr();
   bool kompmgrAvailable_;
-  KProcess *kompmgr;
+  TDEProcess *kompmgr;
 
 private slots:
   void resetKompmgr();
-- 
cgit v1.2.1