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/charlatan/charlatanui.cpp   | 2 +-
 noatun-plugins/charlatan/configmodule.cpp  | 4 ++--
 noatun-plugins/charlatan/userinterface.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'noatun-plugins/charlatan')

diff --git a/noatun-plugins/charlatan/charlatanui.cpp b/noatun-plugins/charlatan/charlatanui.cpp
index a2a9bec..36113ff 100644
--- a/noatun-plugins/charlatan/charlatanui.cpp
+++ b/noatun-plugins/charlatan/charlatanui.cpp
@@ -27,7 +27,7 @@ extern "C"
 {
 	Plugin * create_plugin()
 	{
-		KGlobal::locale()->insertCatalogue("charlatanui");
+		TDEGlobal::locale()->insertCatalogue("charlatanui");
 		return new Charlatan;
 	}
 }
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index 3624e0b..08056ae 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -53,7 +53,7 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent)
   void
 CharlatanConfigModule::save()
 {
-  KConfig * c(KGlobal::config());
+  KConfig * c(TDEGlobal::config());
   c->setGroup("CharlatanInterface");
   c->writeEntry("ScrollTitle", scroll_->isChecked());
   c->sync();
@@ -63,7 +63,7 @@ CharlatanConfigModule::save()
   void
 CharlatanConfigModule::reopen()
 {
-  KConfig * c(KGlobal::config());
+  KConfig * c(TDEGlobal::config());
   c->setGroup("CharlatanInterface");
   scroll_->setChecked(c->readBoolEntry("ScrollTitle", true));
 }
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index 7f7a41f..b708f02 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -394,7 +394,7 @@ void Charlatan::slotTimeout()
 
 void Charlatan::loadConfig()
 {
-	KConfig * c(KGlobal::config());
+	KConfig * c(TDEGlobal::config());
 	c->setGroup("CharlatanInterface");
 	titleLabel_->setScroll(c->readBoolEntry("ScrollTitle", true));
 }
-- 
cgit v1.2.1