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

6 files changed, 42 insertions, 42 deletions

diff --git a/kcontrol/keys/ChangeLog b/kcontrol/keys/ChangeLog
index b8ef570df..da787a8c6 100644
--- a/kcontrol/keys/ChangeLog
+++ b/kcontrol/keys/ChangeLog
@@ -15,8 +15,8 @@
 	global.cpp did for just the global keys.
 	* converted main.cpp to use keyconfig.cpp rather than
 	global.cpp and standard.cpp for standard and globall
-	key configuration.  KGlobalConfig and KStdConfig disappear. 
-	(KGlobalConfig is renamed to KKeyConfig)
+	key configuration.  TDEGlobalConfig and KStdConfig disappear. 
+	(TDEGlobalConfig is renamed to KKeyConfig)
 	* appropriate changes to Makefile.am.
 	* standard key binding are now #include'd from
 	stdbindings.cpp
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index dc9d30954..539c67215 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -226,7 +226,7 @@ void KKeyModule::defaults()
 /*void KKeyModule::slotRemove()
 {
   TQString kksPath =
-        KGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType);
+        TDEGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType);
 
   TQDir d( kksPath );
   if (!d.exists()) // what can we do?
@@ -360,7 +360,7 @@ void KKeyModule::readScheme( int index )
               TQT_SLOT( slotPreviewScheme( int ) ) );
 
 
-  TQString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/");
+  TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/");
 
   TQDir d( kksPath );
   if ( !d.exists() )
@@ -426,7 +426,7 @@ void KKeyModule::readScheme( int index )
 
 /*void KKeyModule::readSchemeNames( )
 {
-  TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
+  TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
   //TQRegExp r( "-kde[34].kksrc$" );
   TQRegExp r( "-trinity.kksrc$" );
 
@@ -472,11 +472,11 @@ void KKeyModule::init()
   kdDebug(125) << "KKeyModule::init()\n";
 
   /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
-  KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
-  TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
+  KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+  TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
   KAccel::useFourModifierKeys( fourMods == "true" );
   bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
-  KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
+  TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
   */
   KAccelActions* keys = new KAccelActions();
 
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index a91fca234..456818bed 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -132,9 +132,9 @@ extern "C"
   KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/)
   {
 	// What does this do?  Why not insert klipper and kxkb, too? --ellis, 2002/01/15
-	KGlobal::locale()->insertCatalogue("twin");
-	KGlobal::locale()->insertCatalogue("kdesktop");
-	KGlobal::locale()->insertCatalogue("kicker");
+	TDEGlobal::locale()->insertCatalogue("twin");
+	TDEGlobal::locale()->insertCatalogue("kdesktop");
+	TDEGlobal::locale()->insertCatalogue("kicker");
 	return new KeyModule(parent, "kcmkeys");
   }
 
@@ -142,8 +142,8 @@ extern "C"
   {
 	kdDebug(125) << "KeyModule::initModifiers()" << endl;
 
-	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();
   }
@@ -153,11 +153,11 @@ extern "C"
 	kdDebug(125) << "KeyModule::init()\n";
 
 	/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
-	KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
-	TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
+	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
 	KAccel::useFourModifierKeys( fourMods == "true" );
 	bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
-	KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
+	TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
 	*/
 	KAccelActions* keys = new KAccelActions();
 
@@ -179,16 +179,16 @@ extern "C"
   // This is needed to be able to check for conflicts with global keys in app's keyconfig
   // dialogs, kdeglobals is empty as long as you don't apply any change in controlcenter/keys.
   // However, avoid writing at every KDE startup, just update them after every rebuild of this file.
-        KConfigGroup group( KGlobal::config(), "Global Shortcuts" );
+        KConfigGroup group( TDEGlobal::config(), "Global Shortcuts" );
         if( group.readEntry( "Defaults timestamp" ) != __DATE__ __TIME__ ) {
 	    kdDebug(125) << "KeyModule::init() - Read Config Bindings\n";
 	    // Check for old group,
-	    if( KGlobal::config()->hasGroup( "Global Keys" ) ) {
+	    if( TDEGlobal::config()->hasGroup( "Global Keys" ) ) {
 		keys->readActions( "Global Keys" );
-		KGlobal::config()->deleteGroup( "Global Keys", true, true );
+		TDEGlobal::config()->deleteGroup( "Global Keys", true, true );
 	    }
 	    keys->readActions( "Global Shortcuts" );
-            KGlobal::config()->deleteGroup( "Global Shortcuts", true, true );
+            TDEGlobal::config()->deleteGroup( "Global Shortcuts", true, true );
 
 	    kdDebug(125) << "KeyModule::init() - Write Config Bindings\n";
 	    keys->writeActions( "Global Shortcuts", 0, true, true );
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index db304f0c5..05802de74 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -61,7 +61,7 @@ ModifiersModule::ModifiersModule( TQWidget *parent, const char *name )
 
 void ModifiersModule::load( bool useDefaults )
 {
-   KConfig *c = KGlobal::config();
+   KConfig *c = TDEGlobal::config();
 
    c->setReadDefaults( useDefaults );
 
@@ -82,35 +82,35 @@ void ModifiersModule::save()
 {
 	kdDebug(125) << "ModifiersModule::save()" << endl;
 
-	KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
+	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 
 	if( m_plblCtrl->text() != "Ctrl" )
-		KGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true );
+		TDEGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true );
 	else
-		KGlobal::config()->deleteEntry( "Label Ctrl", false, true );
+		TDEGlobal::config()->deleteEntry( "Label Ctrl", false, true );
 
 	if( m_plblAlt->text() != "Alt" )
-		KGlobal::config()->writeEntry( "Label Alt", m_plblAlt->text(), true, true );
+		TDEGlobal::config()->writeEntry( "Label Alt", m_plblAlt->text(), true, true );
 	else
-		KGlobal::config()->deleteEntry( "Label Alt", false, true );
+		TDEGlobal::config()->deleteEntry( "Label Alt", false, true );
 
 	if( m_plblWin->text() != "Win" )
-		KGlobal::config()->writeEntry( "Label Win", m_plblWin->text(), true, true );
+		TDEGlobal::config()->writeEntry( "Label Win", m_plblWin->text(), true, true );
 	else
-		KGlobal::config()->deleteEntry( "Label Win", false, true );
+		TDEGlobal::config()->deleteEntry( "Label Win", false, true );
 
 	if( m_pchkMacKeyboard->isChecked() )
-		KGlobal::config()->writeEntry( "Mac Keyboard", true, true, true );
+		TDEGlobal::config()->writeEntry( "Mac Keyboard", true, true, true );
 	else
-		KGlobal::config()->deleteEntry( "Mac Keyboard", false, true );
+		TDEGlobal::config()->deleteEntry( "Mac Keyboard", false, true );
 
 	bool bMacSwap = m_pchkMacKeyboard->isChecked() && m_pchkMacSwap->isChecked();
 	if( bMacSwap )
-		KGlobal::config()->writeEntry( "Mac Modifier Swap", true, true, true );
+		TDEGlobal::config()->writeEntry( "Mac Modifier Swap", true, true, true );
 	else
-		KGlobal::config()->deleteEntry( "Mac Modifier Swap", false, true );
+		TDEGlobal::config()->deleteEntry( "Mac Modifier Swap", false, true );
 
-	KGlobal::config()->sync();
+	TDEGlobal::config()->sync();
 
 	if( m_bMacSwapOrig != bMacSwap ) {
 		if( bMacSwap )
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 265f25564..3dac9dcf7 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -69,10 +69,10 @@ void ShortcutsModule::save()
 
 	// FIXME: This isn't working.  Why? -- ellis, 2002/01/27
 	// Check for old group,
-	if( KGlobal::config()->hasGroup( "Keys" ) ) {
-		KGlobal::config()->deleteGroup( "Keys", true, true );
+	if( TDEGlobal::config()->hasGroup( "Keys" ) ) {
+		TDEGlobal::config()->deleteGroup( "Keys", true, true );
 	}
-	KGlobal::config()->sync();
+	TDEGlobal::config()->sync();
 
 	m_pkcGeneral->commitChanges();
 	m_pkcSequence->commitChanges();
@@ -104,7 +104,7 @@ TQString ShortcutsModule::quickHelp() const
 
 void ShortcutsModule::initGUI()
 {
-	TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
+	TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/";
 
 	kdDebug(125) << "A-----------" << endl;
 	KAccelActions* keys = &m_actionsGeneral;
@@ -264,7 +264,7 @@ void ShortcutsModule::createActionsSequence()
 
 void ShortcutsModule::readSchemeNames()
 {
-	TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc");
+	TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc");
 
 	m_pcbSchemes->clear();
 	m_rgsSchemeFiles.clear();
@@ -406,7 +406,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 
 	disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) );
 
-	TQString kksPath = KGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
+	TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
 
 	TQDir dir( kksPath );
 	if( !dir.exists() && !dir.mkdir( kksPath ) ) {
@@ -458,7 +458,7 @@ void ShortcutsModule::slotRemoveScheme()
 
 void ShortcutsModule::slotUseRmWinKeysClicked()
 {
-	TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
+	TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/";
 
 	// See if ~/.trinity/env/win-key.sh exists
 	TQFile f( kde_winkeys_env_dir + "win-key.sh" );
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 58de8a1f5..31b39974f 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -215,7 +215,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath)
     TQStringList filelist;
 
     // loop through all resource dirs and build a file list
-    TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+    TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps");
     for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
     {
         TQDir dir((*it) + "/" + relativePath);
@@ -254,7 +254,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath)
     TQStringList dirlist;
 
     // loop through all resource dirs and build a subdir list
-    TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+    TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps");
     for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
     {
         TQDir dir((*it) + "/" + relativePath);