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

---
 kicker-applets/kolourpicker/kolourpicker.cpp | 4 ++--
 kicker-applets/kolourpicker/simplebutton.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kicker-applets/kolourpicker')

diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index a51229e..58dc30c 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -50,7 +50,7 @@ extern "C"
 {
 	KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
 	{
-		KGlobal::locale()->insertCatalogue("kolourpicker");
+		TDEGlobal::locale()->insertCatalogue("kolourpicker");
 		return new KolourPicker(configFile, KPanelApplet::Normal,
 			KPanelApplet::About,
 			parent, "kolourpicker");
@@ -100,7 +100,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type,
 
 KolourPicker::~KolourPicker()
 {
-    KGlobal::locale()->removeCatalogue("kolourpicker");
+    TDEGlobal::locale()->removeCatalogue("kolourpicker");
 }
 
 
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index 2706af2..1a2631e 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -147,7 +147,7 @@ void SimpleButton::slotSettingsChanged(int category)
         return;
     }
 
-    bool changeCursor = KGlobalSettings::changeCursorOverIcon();
+    bool changeCursor = TDEGlobalSettings::changeCursorOverIcon();
 
     if (changeCursor)
     {
-- 
cgit v1.2.1