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

---
 knetload/knetload.cpp  | 4 ++--
 knetload/statpopup.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/knetload/knetload.cpp b/knetload/knetload.cpp
index 3ce2b81..fcaf1be 100644
--- a/knetload/knetload.cpp
+++ b/knetload/knetload.cpp
@@ -328,8 +328,8 @@ void KNetLoad::takeReadingInternal() {
         fullReading = i18n(
             "Current In: %1 KBit/s, Total In: %2 MB.\n"
             "Current Out: %3 KBit/s, Total Out: %4 MB.")
-            .arg(KGlobal::locale()->formatNumber((int)((bitRateIn  + 50) / 100) / 10.0)).arg(KGlobal::locale()->formatNumber(proc->totalMbIn()))
-            .arg(KGlobal::locale()->formatNumber((int)((bitRateOut + 50) / 100) / 10.0)).arg(KGlobal::locale()->formatNumber(proc->totalMbOut()));
+            .arg(TDEGlobal::locale()->formatNumber((int)((bitRateIn  + 50) / 100) / 10.0)).arg(TDEGlobal::locale()->formatNumber(proc->totalMbIn()))
+            .arg(TDEGlobal::locale()->formatNumber((int)((bitRateOut + 50) / 100) / 10.0)).arg(TDEGlobal::locale()->formatNumber(proc->totalMbOut()));
 }
 
 void KNetLoad::updateDeviceMenu(KPopupMenu* menu) {
diff --git a/knetload/statpopup.cpp b/knetload/statpopup.cpp
index a501437..777bc0a 100644
--- a/knetload/statpopup.cpp
+++ b/knetload/statpopup.cpp
@@ -56,7 +56,7 @@ StatPopup::StatPopup(bool useSupportSplit, TQWidget *parent, const char *name) :
 
     // Prepare for actions and the config file, but don't actually add
     // any actions or read the configuration.
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     coll = new KActionCollection(this);
 
     // Set up a timer for our periodic updates.
@@ -116,7 +116,7 @@ void StatPopup::initDock(StatDock* target, KPopupMenu* menu, int whichDock) {
     actColor1->plug(menu);
     menu->insertSeparator();
     menu->insertItem(SmallIcon("help"), i18n("&Help"),
-        (new KHelpMenu(0, KGlobal::instance()->aboutData(), false))->menu());
+        (new KHelpMenu(0, TDEGlobal::instance()->aboutData(), false))->menu());
 
     // Set up display properties for the dock.
     target->setActive(actActive->isChecked());