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

---
 kpf/src/Applet.cpp                 | 8 ++++----
 kpf/src/BandwidthGraph.cpp         | 6 +++---
 kpf/src/DirectoryLister.cpp        | 2 +-
 kpf/src/PropertiesDialogPlugin.cpp | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kpf/src')

diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 04a355c6..217128a5 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -72,7 +72,7 @@ extern "C"
     {
       kpf::blockSigPipe();
 
-      KGlobal::locale()->insertCatalogue("kpf");
+      TDEGlobal::locale()->insertCatalogue("kpf");
 
       return new KPF::Applet
         (
@@ -372,11 +372,11 @@ namespace KPF
     TQPixmap px;
 
     if (width() > 48)
-      px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48);
+      px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48);
     else if (width() > 32)
-      px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 32);
+      px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 32);
     else if (width() > 16)
-      px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 16);
+      px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 16);
     else
       return;
 
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index d5a26233..ba02e69d 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -144,11 +144,11 @@ namespace KPF
     buffer_.resize(size());
 
     if ( width() > 48 )
-      bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 48 );
+      bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 48 );
     else if ( width() > 32 )
-      bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 32 );
+      bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 32 );
     else if ( width() > 16 )
-      bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 16 );
+      bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 16 );
     else
       bgPix_.fill( this, TQPoint( 0, 0 ) );
 
diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp
index 6aec78d7..c0b0a503 100644
--- a/kpf/src/DirectoryLister.cpp
+++ b/kpf/src/DirectoryLister.cpp
@@ -117,7 +117,7 @@ namespace KPF
       << "background-color: "
       << colorToCSS
       (
-        KGlobalSettings::calculateAlternateBackgroundColor
+        TDEGlobalSettings::calculateAlternateBackgroundColor
         (pal.color(TQPalette::Normal, TQColorGroup::Base))
       )
       << "; "
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index 8cf14a7c..d3a0a7c9 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -661,7 +661,7 @@ namespace KPF
   {
     TQString noWarningKey("DoNotWarnAboutSharingDirectoriesViaHTTP");
 
-    KConfig * config(KGlobal::config());
+    KConfig * config(TDEGlobal::config());
 
     if (config->readBoolEntry(noWarningKey, false))
       return true;
-- 
cgit v1.2.1