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

---
 khangman/khangman/khangman.cpp  | 4 ++--
 khangman/khangman/khangman.kcfg | 2 +-
 khangman/khangman/main.cpp      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'khangman')

diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 9c3e54b4..7113f879 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -191,7 +191,7 @@ void KHangMan::setLanguages()
     m_languageNames.clear();
     m_sortedNames.clear();
     //the program scans in khangman/data/ to see what languages data is found
-    TQStringList mdirs = KGlobal::dirs()->findDirs("data", "khangman/data/");
+    TQStringList mdirs = TDEGlobal::dirs()->findDirs("data", "khangman/data/");
     if (mdirs.isEmpty()) return;
     for (TQStringList::Iterator it =mdirs.begin(); it !=mdirs.end(); ++it ) {
         TQDir dir(*it);
@@ -284,7 +284,7 @@ void KHangMan::loadLevels()
 {
     //build the Level combobox menu dynamically depending of the data for each language
     levels.clear();//initialize TQStringList levels
-    KStandardDirs *dirs = KGlobal::dirs();
+    KStandardDirs *dirs = TDEGlobal::dirs();
     TQStringList mfiles = dirs->findAllResources("data","khangman/data/" + Prefs::selectedLanguage() + "/*.kvtml");
     bool levelBool = false;
     if (!mfiles.isEmpty())
diff --git a/khangman/khangman/khangman.kcfg b/khangman/khangman/khangman.kcfg
index 029b0913..40fa12cb 100644
--- a/khangman/khangman/khangman.kcfg
+++ b/khangman/khangman/khangman.kcfg
@@ -20,7 +20,7 @@
         <entry name="SelectedLanguage" type="String">
             <label>The language selected by the user</label>
             <code>
-                KConfigBase *globalConf = KGlobal::config();
+                KConfigBase *globalConf = TDEGlobal::config();
                 globalConf->setGroup("Locale");
                 QString userLanguage = globalConf->readEntry("Language", "en");
                 if (userLanguage.isEmpty())
diff --git a/khangman/khangman/main.cpp b/khangman/khangman/main.cpp
index dcfae7f2..e81d3e8e 100644
--- a/khangman/khangman/main.cpp
+++ b/khangman/khangman/main.cpp
@@ -119,13 +119,13 @@ int main(int argc, char **argv)
     TQFont fd("Dustismo Roman", 12, TQFont::Normal, true);
     if (!fontChecker::checkInstalled(f, locate("appdata", "fonts/Domestic_Manners.ttf")))
     {
-            KProcess *proc = new KProcess;
+            TDEProcess *proc = new TDEProcess;
             for (int i = 0; i < argc; i++) *proc << argv[i];
             proc->start();
     }
     else if (!fontChecker::checkInstalled(fd, locate("appdata", "fonts/Dustismo_Roman.ttf")))
     {
-        KProcess *proc = new KProcess;
+        TDEProcess *proc = new TDEProcess;
         for (int i = 0; i < argc; i++) *proc << argv[i];
         proc->start();
     }
-- 
cgit v1.2.1