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

4 files changed, 9 insertions, 9 deletions

diff --git a/kcontrol/tdm/background.h b/kcontrol/tdm/background.h
index 2e5182b16..d88629c35 100644
--- a/kcontrol/tdm/background.h
+++ b/kcontrol/tdm/background.h
@@ -16,7 +16,7 @@
 
 class KSimpleConfig;
 class BGDialog;
-class KGlobalBackgroundSettings;
+class TDEGlobalBackgroundSettings;
 class TQCheckBox;
 class TQLabel;
 
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index d3693768e..8348a617b 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -121,7 +121,7 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
 
   setlocale( LC_COLLATE, "C" );
 
-  KGlobal::locale()->insertCatalogue("kcmbackground");
+  TDEGlobal::locale()->insertCatalogue("kcmbackground");
 
   TQStringList sl;
   TQMap<gid_t,TQStringList> tgmap;
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index d3629d861..bcd7517aa 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -288,7 +288,7 @@ void TDMAppearanceWidget::makeReadOnly()
 
 void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
 {
-  TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
+  TQStringList langlist = TDEGlobal::dirs()->findAllResources("locale",
 			TQString::fromLatin1("*/entry.desktop"));
   langlist.sort();
   for ( TQStringList::ConstIterator it = langlist.begin();
@@ -308,7 +308,7 @@ void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
 void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
 {
   // XXX: Global + local schemes
-  TQStringList list = KGlobal::dirs()->
+  TQStringList list = TDEGlobal::dirs()->
       findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true);
   for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
   {
@@ -329,7 +329,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
 void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
 {
   // XXX: Global + local schemes
-  TQStringList list = KGlobal::dirs()->
+  TQStringList list = TDEGlobal::dirs()->
       findAllResources("data", "kstyle/themes/*.themerc", false, true);
   for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
   {
@@ -429,7 +429,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
 
 	// we gotta check if it is a non-local file and make a tmp copy at the hd.
 	if(!url->isLocalFile()) {
-	    pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() +
+	    pixurl.setPath(TDEGlobal::dirs()->resourceDirs("data").last() +
 		     "tdm/pics/" + url->fileName());
 	    KIO::NetAccess::copy(*url, pixurl, parentWidget());
 	    istmp = true;
@@ -462,7 +462,7 @@ void TDMAppearanceWidget::save()
   config->writeEntry("LogoArea", noneRadio->isChecked() ? "None" :
 			    logoRadio->isChecked() ? "Logo" : "Clock" );
 
-  config->writeEntry("LogoPixmap", KGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true));
+  config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true));
 
   config->writeEntry("Compositor", compositorcombo->currentId());
 
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index f4b48b9a6..3be482a17 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -74,7 +74,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
     // We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users,
     // and create them if necessary.
     config->setGroup( "X-*-Greeter" );
-    m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
+    m_userPixDir = config->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
     m_notFirst = false;
     TQDir testDir( m_userPixDir );
     if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() )
@@ -301,7 +301,7 @@ void TDMUsersWidget::changeUserPix(const TQString &pix)
 void TDMUsersWidget::slotUserButtonClicked()
 {
     KFileDialog dlg(m_notFirst ? TQString::null :
-	KGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/users",
+	TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/users",
                     KImageIO::pattern( KImageIO::Reading ),
                     this, 0, true);
     dlg.setOperationMode( KFileDialog::Opening );