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

3 files changed, 18 insertions, 18 deletions

diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index 5b881fd..5d64685 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -62,7 +62,7 @@ void SynaePrefs::save()
 	if(!changed)
 		return;
 
-	KConfig *c = KGlobal::config();
+	KConfig *c = TDEGlobal::config();
 	c->setGroup("Synaescope");
 	c->writeEntry("xResolution", xRes->value());
 	c->writeEntry("yResolution", yRes->value());
@@ -73,7 +73,7 @@ void SynaePrefs::save()
 void SynaePrefs::reopen()
 {
 //	kdDebug(66666) << k_funcinfo << endl;
-	KConfig *c = KGlobal::config();
+	KConfig *c = TDEGlobal::config();
 	c->setGroup("Synaescope");
 
 	xRes->setValue(c->readNumEntry("xResolution", 320));
diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp
index 16a6a2e..a401704 100644
--- a/noatun-plugins/synaescope/synaescope.cpp
+++ b/noatun-plugins/synaescope/synaescope.cpp
@@ -17,7 +17,7 @@ extern "C"
 {
 	Plugin *create_plugin()
 	{
-		KGlobal::locale()->insertCatalogue("synaescope");
+		TDEGlobal::locale()->insertCatalogue("synaescope");
 		return new SynaeScope();
 	}
 }
@@ -26,12 +26,12 @@ SynaeScope::SynaeScope() : Plugin(), scopeExePath(0)
 {
 	kdDebug(66666) << k_funcinfo << endl;
 	restarting=false;
-	connect(&process, TQT_SIGNAL(processExited(KProcess *)),
-		this, TQT_SLOT(processExited(KProcess *)));
-	connect(&process, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),
-		this, TQT_SLOT(receivedStdout(KProcess *,char *,int)));
-	connect(&process, TQT_SIGNAL(receivedStderr(KProcess *,char *,int)),
-		this, TQT_SLOT(receivedStderr(KProcess *,char *,int)));
+	connect(&process, TQT_SIGNAL(processExited(TDEProcess *)),
+		this, TQT_SLOT(processExited(TDEProcess *)));
+	connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),
+		this, TQT_SLOT(receivedStdout(TDEProcess *,char *,int)));
+	connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)),
+		this, TQT_SLOT(receivedStderr(TDEProcess *,char *,int)));
 }
 
 SynaeScope::~SynaeScope()
@@ -63,7 +63,7 @@ void SynaeScope::init()
 void SynaeScope::runScope()
 {
 	kdDebug(66666) << k_funcinfo << endl;
-	if(!process.start(KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdin | KProcess::Stdout)))
+	if(!process.start(TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdin | TDEProcess::Stdout)))
 	{
 		KMessageBox::error(0, i18n("Unable to start noatunsynaescope. Check your installation."));
 		unload();
@@ -81,7 +81,7 @@ void SynaeScope::readConfig()
 	process.kill();
 }
 
-void SynaeScope::processExited(KProcess *)
+void SynaeScope::processExited(TDEProcess *)
 {
 	kdDebug(66666) << k_funcinfo << endl;
 	if(restarting)
@@ -95,13 +95,13 @@ void SynaeScope::processExited(KProcess *)
 	}
 }
 
-void SynaeScope::receivedStdout(KProcess *, char *buf, int len)
+void SynaeScope::receivedStdout(TDEProcess *, char *buf, int len)
 {
 	TQCString debugString(buf,len);
 	kdDebug(66666) << k_funcinfo << debugString << endl;
 }
 
-void SynaeScope::receivedStderr(KProcess *, char *buf, int len)
+void SynaeScope::receivedStderr(TDEProcess *, char *buf, int len)
 {
 	TQCString debugString(buf,len);
 	kdDebug(66666) << k_funcinfo << debugString << endl;
diff --git a/noatun-plugins/synaescope/synaescope.h b/noatun-plugins/synaescope/synaescope.h
index 2579151..e62fbe0 100644
--- a/noatun-plugins/synaescope/synaescope.h
+++ b/noatun-plugins/synaescope/synaescope.h
@@ -12,7 +12,7 @@
 #include <kprocess.h>
 
 class SynaePrefs;
-class KProcess;
+class TDEProcess;
 
 class SynaeScope : public TQObject, public Plugin
 {
@@ -27,13 +27,13 @@ public:
 	void runScope();
 
 private slots:
-	void processExited(KProcess *);
+	void processExited(TDEProcess *);
 	void readConfig();
-	void receivedStdout(KProcess *, char *buf, int len);
-	void receivedStderr(KProcess *, char *buf, int len);
+	void receivedStdout(TDEProcess *, char *buf, int len);
+	void receivedStderr(TDEProcess *, char *buf, int len);
 
 private:
-	KProcess process;
+	TDEProcess process;
 	TQString scopeExePath;
 	bool restarting;
 	SynaePrefs *mPrefs;