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

4 files changed, 18 insertions, 18 deletions

diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp
index e125e4d5..1ac1a50c 100644
--- a/kbackgammon/engines/gnubg/kbggnubg.cpp
+++ b/kbackgammon/engines/gnubg/kbggnubg.cpp
@@ -484,12 +484,12 @@ void KBgEngineGNU::start()
 	 */
 	gnubg << "gnubg" << "--tty";
 
-        connect(&gnubg, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(gnubgExit(KProcess *)));
-        connect(&gnubg, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
-		this, TQT_SLOT(receiveData(KProcess *, char *, int)));
-	connect(&gnubg, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
-		this, TQT_SLOT(receiveData(KProcess *, char *, int)));
-	connect(&gnubg, TQT_SIGNAL(wroteStdin(KProcess *)), this, TQT_SLOT(wroteStdin(KProcess *)));
+        connect(&gnubg, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(gnubgExit(TDEProcess *)));
+        connect(&gnubg, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+		this, TQT_SLOT(receiveData(TDEProcess *, char *, int)));
+	connect(&gnubg, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+		this, TQT_SLOT(receiveData(TDEProcess *, char *, int)));
+	connect(&gnubg, TQT_SIGNAL(wroteStdin(TDEProcess *)), this, TQT_SLOT(wroteStdin(TDEProcess *)));
 
 	startGNU();
 }
@@ -502,7 +502,7 @@ void KBgEngineGNU::startGNU()
 
 	resAction->setEnabled(false);
 
-	if (!gnubg.start(KProcess::NotifyOnExit, KProcess::All))
+	if (!gnubg.start(TDEProcess::NotifyOnExit, TDEProcess::All))
 		KMessageBox::information((TQWidget *)parent(),
 	                i18n("Could not start the GNU Backgammon process.\n"
 			     "Make sure the program is in your PATH and is "
@@ -518,7 +518,7 @@ void KBgEngineGNU::startGNU()
 /*
  * The gnubg process has died. Stop all user activity and allow a restart.
  */
-void KBgEngineGNU::gnubgExit(KProcess *proc)
+void KBgEngineGNU::gnubgExit(TDEProcess *proc)
 {
 	ct->stop();
 
@@ -544,7 +544,7 @@ void KBgEngineGNU::gnubgExit(KProcess *proc)
 /*
  * Last command has been sent. Try to send pending ones.
  */
-void KBgEngineGNU::wroteStdin(KProcess *proc)
+void KBgEngineGNU::wroteStdin(TDEProcess *proc)
 {
 	if (!proc->isRunning())
 		return;
@@ -577,7 +577,7 @@ void KBgEngineGNU::nextCommand()
  * Get data from GNU Backgammon and process them. Note that we may have
  * to buffer the last line and wait for the closing newline...
  */
-void KBgEngineGNU::receiveData(KProcess *proc, char *buffer, int buflen)
+void KBgEngineGNU::receiveData(TDEProcess *proc, char *buffer, int buflen)
 {
 	if (!proc->isRunning())
 		return;
diff --git a/kbackgammon/engines/gnubg/kbggnubg.h b/kbackgammon/engines/gnubg/kbggnubg.h
index 95db0171..b86e9130 100644
--- a/kbackgammon/engines/gnubg/kbggnubg.h
+++ b/kbackgammon/engines/gnubg/kbggnubg.h
@@ -191,7 +191,7 @@ private:
 
 	enum Turn {uRoll, uMove, tRoll, tMove, maxTurn};
 
-	KProcess gnubg;
+	TDEProcess gnubg;
 
 	TQStringList cmdList;
 
@@ -209,13 +209,13 @@ private:
 
 protected slots:
 
-	void wroteStdin(KProcess *);
+	void wroteStdin(TDEProcess *);
 
-	void receiveData(KProcess *, char *buffer, int buflen);
+	void receiveData(TDEProcess *, char *buffer, int buflen);
 
 	void handleLine(const TQString &l);
 
-	void gnubgExit(KProcess *proc);
+	void gnubgExit(TDEProcess *proc);
 
 	void nextCommand();
 
diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp
index b25153ee..7065ead1 100644
--- a/kbackgammon/kbg.cpp
+++ b/kbackgammon/kbg.cpp
@@ -684,11 +684,11 @@ void KBg::toggleMenubar()
  */
 void KBg::configureToolbars()
 {
-	saveMainWindowSettings(KGlobal::config(), "kedittoolbar settings"); // temp group
+	saveMainWindowSettings(TDEGlobal::config(), "kedittoolbar settings"); // temp group
 	KEditToolbar dlg(actionCollection(), xmlFile(), true, this);
 	connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig()));
 	dlg.exec();
-	KGlobal::config()->deleteGroup( "kedittoolbar settings" ); // delete temp group
+	TDEGlobal::config()->deleteGroup( "kedittoolbar settings" ); // delete temp group
 }
 
 /*
@@ -697,7 +697,7 @@ void KBg::configureToolbars()
 void KBg::newToolbarConfig()
 {
 	createGUI();
-	applyMainWindowSettings(KGlobal::config(), "kedittoolbar settings");
+	applyMainWindowSettings(TDEGlobal::config(), "kedittoolbar settings");
 }
 
 /*
diff --git a/kbackgammon/main.cpp b/kbackgammon/main.cpp
index 51d3eb96..af57085a 100644
--- a/kbackgammon/main.cpp
+++ b/kbackgammon/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 	TDECmdLineArgs::init(argc, argv, &about);
 
 	TDEApplication app;
-	KGlobal::locale()->insertCatalogue("libtdegames");
+	TDEGlobal::locale()->insertCatalogue("libtdegames");
 
 	if (app.isRestored())
 		RESTORE(KBg)