Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

3 files changed, 12 insertions, 12 deletions

diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index 6c9a78c8..d9ee9d9c 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -79,7 +79,7 @@ KTouch::KTouch()
 	setupGUI(ToolBar | Keys | StatusBar | Create);
 	setAutoSaveSettings();
 	// Read user statistics
-	KURL stat_file = KGlobal::dirs()->findResource("data", "ktouch/statistics.xml");
+	KURL stat_file = TDEGlobal::dirs()->findResource("data", "ktouch/statistics.xml");
 	//kdDebug() << "[KTouch::KTouch]  readings statistics from file '" << stat_file << "'" << endl;
 	if (!m_stats.read(this, stat_file))
 		m_stats.clear();	// if we can't read it, start with empty statistics
@@ -518,10 +518,10 @@ bool KTouch::queryExit() {
     Prefs::writeConfig();
 	// update and save statistics
 	m_trainer->storeTrainingStatistics();
-	KURL stat_file = KGlobal::dirs()->saveLocation("data","ktouch", true) + "statistics.xml";
+	KURL stat_file = TDEGlobal::dirs()->saveLocation("data","ktouch", true) + "statistics.xml";
 	//kdDebug() << "[KTouch::queryExit]  Writing statistics to file: '" << stat_file << "'" << endl;
 	m_stats.write(this, stat_file);
-	KURL color_file = KGlobal::dirs()->saveLocation("data","ktouch", true) + "color_schemes.xml";
+	KURL color_file = TDEGlobal::dirs()->saveLocation("data","ktouch", true) + "color_schemes.xml";
 	KTouchColorScheme::writeList(this, color_file);
     return true;
 }
@@ -625,7 +625,7 @@ void KTouch::init() {
     if (m_keyboardFiles.contains(Prefs::currentKeyboardFile() )==0) {
         TQString default_keyboard;
         // determine locale
-        TQString lang = KGlobal::locale()->language();
+        TQString lang = TDEGlobal::locale()->language();
         TQString fname = lang + ".keyboard";
         // try to find keyboard with current locale
         TQStringList::const_iterator it = m_keyboardFiles.constBegin();
@@ -647,7 +647,7 @@ void KTouch::init() {
     // create some default colour schemes
     KTouchColorScheme::createDefaults();
     // read additional color schemes
-	KURL color_file = KGlobal::dirs()->findResource("data", "ktouch/color_schemes.xml");
+	KURL color_file = TDEGlobal::dirs()->findResource("data", "ktouch/color_schemes.xml");
 	KTouchColorScheme::readList(this, color_file);
 }
 // ----------------------------------------------------------------------------
@@ -747,7 +747,7 @@ void KTouch::updateFontFromLecture() {
 // This function populates the file lists with the installed training, keyboard and 
 // examination files.
 void KTouch::updateFileLists() {
-    KStandardDirs *dirs = KGlobal::dirs();
+    KStandardDirs *dirs = TDEGlobal::dirs();
 	
     // first search for all installed keyboard files
 	// TODO : search in i18n() directories
@@ -772,10 +772,10 @@ void KTouch::updateFileLists() {
         // get everything in front of the first .
         TQString lang_iso = fname.section('.',0,0);
         // get language description of file names
-        TQString lang_name = KGlobal::locale()->twoAlphaToLanguageName(lang_iso);
+        TQString lang_name = TDEGlobal::locale()->twoAlphaToLanguageName(lang_iso);
 //        kdDebug() << fname << " | " << lang_iso << " | " << lang_name << endl;
         if (lang_name.isEmpty())
-            lang_name = KGlobal::locale()->twoAlphaToCountryName(lang_iso);
+            lang_name = TDEGlobal::locale()->twoAlphaToCountryName(lang_iso);
         if (!lang_name.isEmpty())
             lang_name += " (" + fname + ")";
         else
diff --git a/ktouch/src/ktouch.kcfg b/ktouch/src/ktouch.kcfg
index 829bf6fb..ab7e636f 100644
--- a/ktouch/src/ktouch.kcfg
+++ b/ktouch/src/ktouch.kcfg
@@ -91,7 +91,7 @@
     </entry>
     <entry type="Font" name="KeyboardFont" >
       <label >The font for the keys on the keyboard</label>
-      <default >KGlobalSettings::generalFont()</default>
+      <default >TDEGlobalSettings::generalFont()</default>
     </entry>
     <entry type="Path" name="CurrentKeyboardFile" >
       <label >The currently loaded keyboard file</label>
diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp
index 7ed140ca..b13b3a30 100644
--- a/ktouch/src/ktouchtrainer.cpp
+++ b/ktouch/src/ktouchtrainer.cpp
@@ -51,9 +51,9 @@ KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, K
 	m_sessionStats.clear();
 
 	/// \todo preload sounds and improve sound playback system
-    m_levelUpSound = KGlobal::dirs()->findResource("appdata","up.wav");
-    m_levelDownSound = KGlobal::dirs()->findResource("appdata","down.wav");
-    m_typeWriterSound = KGlobal::dirs()->findResource("appdata","typewriter.wav");
+    m_levelUpSound = TDEGlobal::dirs()->findResource("appdata","up.wav");
+    m_levelDownSound = TDEGlobal::dirs()->findResource("appdata","down.wav");
+    m_typeWriterSound = TDEGlobal::dirs()->findResource("appdata","typewriter.wav");
 
     connect(m_statusWidget->levelUpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelUp()) );
     connect(m_statusWidget->levelDownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelDown()) );