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/clients/kwmtheme/cli_installer/main.cpp | 6 +++---
 twin/clients/kwmtheme/kwmthemeclient.cpp     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'twin/clients/kwmtheme')

diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index 41f5dd7ca..2d944e344 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -57,10 +57,10 @@ int main(int argc, char **argv)
         return(2);
     }
 
-    TQStringList appDirs = KGlobal::dirs()->findDirs("data", "twin");
+    TQStringList appDirs = TDEGlobal::dirs()->findDirs("data", "twin");
     TQString localDirStr = *(appDirs.end());
     if(localDirStr.isEmpty()){
-        localDirStr = KGlobal::dirs()->saveLocation("data", "twin");
+        localDirStr = TDEGlobal::dirs()->saveLocation("data", "twin");
     }
     localDirStr += "/pics/";
     if(!TQFile::exists(localDirStr))
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
     TQFileInfo fi(f);
     KSimpleConfig input(fi.absFilePath());
     srcStr = fi.dirPath(true) + "/";
-    KConfig *output = KGlobal::config();
+    KConfig *output = TDEGlobal::config();
     input.setGroup("Window Border");
     output->setGroup("General");
 
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index e7db7c2d6..012cacc0e 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -83,7 +83,7 @@ static void create_pixmaps()
         return;
     pixmaps_created = true;
     
-    KConfig *config = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     config->setGroup("General");
     TQString tmpStr;
 
@@ -270,7 +270,7 @@ void KWMThemeClient::init()
     TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0);
     layout->addLayout( hb, 1, 1 );
 
-    KConfig *config = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     config->setGroup("Buttons");
     TQString val;
     MyButton *btn;
-- 
cgit v1.2.1