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

5 files changed, 24 insertions, 24 deletions

diff --git a/kxkb/TODO b/kxkb/TODO
index 344422bac..349d580e4 100644
--- a/kxkb/TODO
+++ b/kxkb/TODO
@@ -14,8 +14,8 @@
 - prevent application/window list from growing endlessly
 
 - bug 59203: call kcontrol/keys/modifiers.cpp: 
-	KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
-	bool bMacSwap = KGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
+	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
 	if( bMacSwap )
 		ModifiersModule::setupMacModifierKeys();
     after each switch
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index da1282b12..ca66224d3 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -41,7 +41,7 @@ XKBExtension::XKBExtension(Display *d)
 		d = tqt_xdisplay();
 	m_dpy = d;
 	
-//	TQStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" );
+//	TQStringList dirs = TDEGlobal::dirs()->findDirs ( "tmp", "" );
 //	m_tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0];
 	m_tempDir = locateLocal("tmp", "");
 }
@@ -99,17 +99,17 @@ bool XKBExtension::setXkbOptions(const TQString& options, bool resetOld)
     if (options.isEmpty())
         return true;
 
-    TQString exe = KGlobal::dirs()->findExe("setxkbmap");
+    TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
     if (exe.isEmpty())
         return false;
 
-    KProcess p;
+    TDEProcess p;
     p << exe;
     if( resetOld )
         p << "-option";
     p << "-option" << options;
 
-    p.start(KProcess::Block);
+    p.start(TDEProcess::Block);
 
     return p.normalExit() && (p.exitStatus() == 0);
 }
@@ -150,7 +150,7 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
     if ( layout.isEmpty() )
         return false;
 
-	TQString exe = KGlobal::dirs()->findExe("setxkbmap");
+	TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
 	if( exe.isEmpty() ) {
 		kdError() << "Can't find setxkbmap" << endl;
 		return false;
@@ -168,7 +168,7 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
         fullVariant += variant;
     }
  
-    KProcess p;
+    TDEProcess p;
     p << exe;
 //  p << "-rules" << rule;
 	if( model.isEmpty() == false )
@@ -177,19 +177,19 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
     if( !fullVariant.isNull() && !fullVariant.isEmpty() )
         p << "-variant" << fullVariant;
 
-    p.start(KProcess::Block); 
+    p.start(TDEProcess::Block); 
 
     // reload system-wide hotkey-setup keycode -> keysym maps
     if ( TQFile::exists( "/opt/trinity/share/apps/kxkb/system.xmodmap" ) ) {
-        KProcess pXmodmap;
+        TDEProcess pXmodmap;
         pXmodmap << "xmodmap" << "/opt/trinity/share/apps/kxkb/system.xmodmap";
-        pXmodmap.start(KProcess::Block);
+        pXmodmap.start(TDEProcess::Block);
     }
 
     if ( TQFile::exists( TQDir::home().path() + "/.Xmodmap" ) ) {
-        KProcess pXmodmapHome;
+        TDEProcess pXmodmapHome;
         pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap";
-        pXmodmapHome.start(KProcess::Block);
+        pXmodmapHome.start(TDEProcess::Block);
     }
 
     return p.normalExit() && (p.exitStatus() == 0);
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index 14fdb2049..63e4d25aa 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -528,14 +528,14 @@ void set_repeatrate(int delay, double rate)
   else
      r = (int)floor(rate + 0.5);
 
-  TQString exe = KGlobal::dirs()->findExe("xset");
+  TQString exe = TDEGlobal::dirs()->findExe("xset");
   if (exe.isEmpty())
     return;
 
-  KProcess p;
+  TDEProcess p;
   p << exe << "r" << "rate" << TQString::number(delay) << TQString::number(r);
   
-  p.start(KProcess::Block);
+  p.start(TDEProcess::Block);
 }
 #endif
 
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index 5c2bf2cb0..7e9b11fa9 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -73,7 +73,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled)
     }
 	
     // keep in sync with kcmlayout.cpp
-    keys = new KGlobalAccel(TQT_TQOBJECT(this));
+    keys = new TDEGlobalAccel(TQT_TQOBJECT(this));
 #include "kxkbbindings.cpp"
     keys->updateConnections();
 
@@ -180,7 +180,7 @@ bool KXKBApp::settingsRead()
 
 	initTray();
 	
-	KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
+	TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
 	keys->readSettings();
 	keys->updateConnections();
 
@@ -268,9 +268,9 @@ void KXKBApp::menuActivated(int id)
 	}
 	else if (id == KxkbLabelController::CONFIG_MENU_ID)
     {
-        KProcess p;
+        TDEProcess p;
         p << "kcmshell" << "keyboard_layout";
-        p.start(KProcess::DontCare);
+        p.start(TDEProcess::DontCare);
 	}
 	else if (id == KxkbLabelController::HELP_MENU_ID)
 	{
@@ -324,7 +324,7 @@ void KXKBApp::slotSettingsChanged(int category)
     if ( category != TDEApplication::SETTINGS_SHORTCUTS)
 		return;
 
-    KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
+    TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
     keys->readSettings();
     keys->updateConnections();
 }
@@ -347,7 +347,7 @@ This is done by loading each one of them and then dumping the compiled
 map from the X server into our local buffer.*/
 // void KXKBApp::initPrecompiledLayouts()
 // {
-//     TQStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" );
+//     TQStringList dirs = TDEGlobal::dirs()->findDirs ( "tmp", "" );
 //     TQString tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0]; 
 // 
 // 	TQValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_layouts.end();
diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h
index fc05c620a..18949ba75 100644
--- a/kxkb/kxkb.h
+++ b/kxkb/kxkb.h
@@ -39,7 +39,7 @@ DESCRIPTION
 
 class XKBExtension;
 class XkbRules;
-class KGlobalAccel;
+class TDEGlobalAccel;
 class KWinModule;
 class LayoutMap;
 
@@ -91,7 +91,7 @@ private:
     XKBExtension *m_extension;
     XkbRules *m_rules;
     KxkbLabelController *m_tray;
-    KGlobalAccel *keys;
+    TDEGlobalAccel *keys;
     KWinModule* kWinModule;
     bool m_forceSetXKBMap;
 };