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

---
 src/knutdock.cpp        | 2 +-
 src/knutmessage.cpp     | 2 +-
 src/knutprintupsvar.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/knutdock.cpp b/src/knutdock.cpp
index 7be9218..0443312 100755
--- a/src/knutdock.cpp
+++ b/src/knutdock.cpp
@@ -61,7 +61,7 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD
   clearValues();
 
 
-  KIconLoader *loader = KGlobal::iconLoader();
+  KIconLoader *loader = TDEGlobal::iconLoader();
   m_mainPix = loader->loadIcon ("knutclient",KIcon::Small,16);
 
   // aplications's own icons
diff --git a/src/knutmessage.cpp b/src/knutmessage.cpp
index 1c69e82..c253e5a 100644
--- a/src/knutmessage.cpp
+++ b/src/knutmessage.cpp
@@ -31,7 +31,7 @@ KNutMessage::KNutMessage(const TQString messageText, const typeOfMessage type, c
 
   setCaption("KNutClient");
   m_messageTimer = 0;
-  KIconLoader *loader = KGlobal::iconLoader();
+  KIconLoader *loader = TDEGlobal::iconLoader();
 
   switch(type) {
     case infoMess:
diff --git a/src/knutprintupsvar.cpp b/src/knutprintupsvar.cpp
index ba4bf50..dc776fd 100644
--- a/src/knutprintupsvar.cpp
+++ b/src/knutprintupsvar.cpp
@@ -63,7 +63,7 @@ KNutPrintUpsVar::KNutPrintUpsVar(KNutNet* const upsNet, const bool useDescriptio
     countRWVars=myUpsNet->readNumberVars(KNutNet::RWVars);
     countIComms=myUpsNet->readNumberComms();
 
-    KIconLoader *loader = KGlobal::iconLoader();
+    KIconLoader *loader = TDEGlobal::iconLoader();
     dirPixmap=loader->loadIcon ("folder_open",KIcon::Small,16);
 
     page = plainPage();
-- 
cgit v1.2.1