From 4c097708c4cc24f3b8e4c21f14644f5715767d47 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:40:51 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 noatun-plugins/nexscope/noatunplugin.cpp | 8 ++++----
 noatun-plugins/nexscope/noatunplugin.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'noatun-plugins/nexscope')

diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp
index e0b3d28..a279d48 100644
--- a/noatun-plugins/nexscope/noatunplugin.cpp
+++ b/noatun-plugins/nexscope/noatunplugin.cpp
@@ -10,7 +10,7 @@ extern "C"
 {
 Plugin *create_plugin()
 {
-	KGlobal::locale()->insertCatalogue("nexscope");
+	TDEGlobal::locale()->insertCatalogue("nexscope");
 	return new NexPlugin();
 }
 }
@@ -18,7 +18,7 @@ Plugin *create_plugin()
 
 NexPlugin::NexPlugin()
 {
-	connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *)));
+	connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *)));
 }
 
 NexPlugin::~NexPlugin()
@@ -32,7 +32,7 @@ void NexPlugin::init()
 
 	// Note that process.start() will fail if findExe fails, so there's no real need
 	// for two separate checks.
-	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 noatunNex. Check your installation."));
 		unload();
@@ -40,7 +40,7 @@ void NexPlugin::init()
 
 }
 
-void NexPlugin::processExited(KProcess *)
+void NexPlugin::processExited(TDEProcess *)
 {
 	unload();
 }
diff --git a/noatun-plugins/nexscope/noatunplugin.h b/noatun-plugins/nexscope/noatunplugin.h
index ad3e6e1..56cc21b 100644
--- a/noatun-plugins/nexscope/noatunplugin.h
+++ b/noatun-plugins/nexscope/noatunplugin.h
@@ -16,10 +16,10 @@ public:
 	void init();
 
 private slots:
-	void processExited(KProcess *);
+	void processExited(TDEProcess *);
 
 private:
-	KProcess process;
+	TDEProcess process;
 };
 
 
-- 
cgit v1.2.1