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

9 files changed, 12 insertions, 12 deletions

diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp
index 956f55bb4..6289ec992 100644
--- a/twin/clients/b2/config/config.cpp
+++ b/twin/clients/b2/config/config.cpp
@@ -33,7 +33,7 @@ extern "C"
 B2Config::B2Config( KConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
-	KGlobal::locale()->insertCatalogue("twin_b2_config");
+	TDEGlobal::locale()->insertCatalogue("twin_b2_config");
 	b2Config = new KConfig("twinb2rc");
 	gb = new TQVBox(parent);
 
diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp
index eac4ef4e4..43302b552 100644
--- a/twin/clients/default/config/config.cpp
+++ b/twin/clients/default/config/config.cpp
@@ -32,7 +32,7 @@ extern "C"
 KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
-	KGlobal::locale()->insertCatalogue("twin_clients");
+	TDEGlobal::locale()->insertCatalogue("twin_clients");
 	highcolor = TQPixmap::defaultDepth() > 8;
 	gb = new TQVBox( parent );
         gb->setSpacing( KDialog::spacingHint() );
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index c3be60c80..3c8ce2365 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -192,7 +192,7 @@ bool KDEDefaultHandler::reset( unsigned long changed )
 unsigned long KDEDefaultHandler::readConfig( bool update )
 {
         unsigned long changed = 0;
-	KConfig* conf = KGlobal::config();
+	KConfig* conf = TDEGlobal::config();
 	conf->setGroup("KDEDefault");
 
         bool new_showGrabBar 		= conf->readBoolEntry("ShowGrabBar", true);
diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp
index 1852eadd8..a11695dd2 100644
--- a/twin/clients/keramik/config/config.cpp
+++ b/twin/clients/keramik/config/config.cpp
@@ -51,7 +51,7 @@ extern "C"
 KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
-	KGlobal::locale()->insertCatalogue("twin_clients");
+	TDEGlobal::locale()->insertCatalogue("twin_clients");
 	c = new KConfig( "twinkeramikrc" );
 	
 	ui = new KeramikConfigUI( parent );
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;
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index a1e417cc7..84bc23506 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -28,7 +28,7 @@ extern "C"
 ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent)
 {	
 	clientrc = new KConfig("twinmodernsysrc");
-	KGlobal::locale()->insertCatalogue("twin_clients");
+	TDEGlobal::locale()->insertCatalogue("twin_clients");
 	mainw = new TQWidget(parent);
 	vbox = new TQVBoxLayout(mainw);
 	vbox->setSpacing(6);
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index aa1c7bd0f..73a749bdb 100644
--- a/twin/clients/plastik/config/config.cpp
+++ b/twin/clients/plastik/config/config.cpp
@@ -39,7 +39,7 @@ PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent)
 {
     // create the configuration object
     m_config = new KConfig("twinplastikrc");
-    KGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
 
     // create and show the configuration dialog
     m_dialog = new ConfigDialog(parent);
diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp
index c4c8e5cba..31ac3b83b 100644
--- a/twin/clients/quartz/config/config.cpp
+++ b/twin/clients/quartz/config/config.cpp
@@ -34,7 +34,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
 	quartzConfig = new KConfig("twinquartzrc");
-	KGlobal::locale()->insertCatalogue("twin_clients");
+	TDEGlobal::locale()->insertCatalogue("twin_clients");
 	gb = new TQVBox( parent );
 	cbColorBorder = new TQCheckBox( 
 						i18n("Draw window frames using &titlebar colors"), gb );