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

---
 kiconedit/kiconconfig.cpp | 2 +-
 kiconedit/knew.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'kiconedit')

diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index 207629b4..1a2d7bf2 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -48,7 +48,7 @@
 // little helper:
 static inline TQPixmap loadIcon( const char * name )
 {
-  return KGlobal::instance()->iconLoader()
+  return TDEGlobal::instance()->iconLoader()
     ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
 }
 
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index 4f4bdb89..c48e11cc 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -37,7 +37,7 @@ KIconTemplateContainer* KIconTemplateContainer::instance = 0;
 
 void createStandardTemplates(KIconTemplateContainer *list)
 {
-    KIconLoader *kil = KGlobal::iconLoader();
+    KIconLoader *kil = TDEGlobal::iconLoader();
 
     KIconTemplate it;
     it.path = kil->iconPath("standard", KIcon::User);
-- 
cgit v1.2.3