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

5 files changed, 9 insertions, 9 deletions

diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index a284df69e..708587527 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -35,7 +35,7 @@
 
 #include "configdialog.h"
 
-ConfigDialog::ConfigDialog(KGlobalAccel *accel,
+ConfigDialog::ConfigDialog(TDEGlobalAccel *accel,
                             bool isApplet )
     : KDialogBase( Tabbed, i18n("Configure"),
                     Ok | Cancel | Help,
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 584237975..561732078 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -33,7 +33,7 @@
 #include <klistview.h>
 #include <knuminput.h>
 
-class KGlobalAccel;
+class TDEGlobalAccel;
 class KKeyChooser;
 class KListView;
 class TQPushButton;
@@ -45,7 +45,7 @@ class ConfigDialog : public KDialogBase
     Q_OBJECT
 
 public:
-    ConfigDialog(KGlobalAccel *accel, bool isApplet );
+    ConfigDialog(TDEGlobalAccel *accel, bool isApplet );
     ~ConfigDialog();
 
     virtual void show();
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 2cdcdb636..85a5e3f60 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -52,7 +52,7 @@
 KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	: KSystemTray(parent, name)
 	, m_popupUp(false)
-	, m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection()))
+	, m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()))
 {
 	setPixmap(KSystemTray::loadSizedIcon("randr", width()));
 	setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
@@ -61,8 +61,8 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	my_parent = parent;
 
 	//printf("Reading configuration...\n\r");
-	globalKeys = new KGlobalAccel(TQT_TQOBJECT(this));
-	KGlobalAccel* keys = globalKeys;
+	globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+	TDEGlobalAccel* keys = globalKeys;
 #include "krandrbindings.cpp"
 	// the keys need to be read from kdeglobals, not kickerrc
 	globalKeys->readSettings();
@@ -90,7 +90,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 		applyIccConfiguration(cur_profile, NULL);
 	}
 
-	TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
 }
 
diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h
index eb2025ab0..8a910f373 100644
--- a/kcontrol/randr/krandrtray.h
+++ b/kcontrol/randr/krandrtray.h
@@ -36,7 +36,7 @@ class KRandRSystemTray :  public KSystemTray, public KRandrSimpleAPI
 
 public:
 	KRandRSystemTray(TQWidget* parent = 0, const char *name = 0);
-	KGlobalAccel *globalKeys;
+	TDEGlobalAccel *globalKeys;
 
 	virtual void contextMenuAboutToShow(KPopupMenu* menu);
 
diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp
index 18df71fbc..1e8edc83e 100644
--- a/kcontrol/randr/main.cpp
+++ b/kcontrol/randr/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "rodda@kde.org");
 	aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "l.lunak@suse.cz");
 	aboutData.setProductName("krandr/krandrtray");
-	KGlobal::locale()->setMainCatalogue("krandr");
+	TDEGlobal::locale()->setMainCatalogue("krandr");
 
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);