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

---
 tdecore/kconfig_compiler/tests/test8a.cpp.ref | 4 ++--
 tdecore/kconfig_compiler/tests/test8a.h.ref   | 2 +-
 tdecore/kconfig_compiler/tests/test8a.kcfg    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tdecore/kconfig_compiler/tests')

diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref
index f89b7c133..413e75c9c 100644
--- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test8a.cpp.ref
@@ -9,10 +9,10 @@ Test8a::Test8a(  KSharedConfig::Ptr config  )
   setCurrentGroup( TQString::fromLatin1( "Group" ) );
 
   KConfigSkeleton::ItemFont  *itemFont;
-  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
+  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() );
   addItem( itemFont, TQString::fromLatin1( "Font" ) );
   KConfigSkeleton::ItemFont  *itemTitleFont;
-  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
+  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() );
   addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/kconfig_compiler/tests/test8a.h.ref
index 2e947c437..0ab182a04 100644
--- a/tdecore/kconfig_compiler/tests/test8a.h.ref
+++ b/tdecore/kconfig_compiler/tests/test8a.h.ref
@@ -11,7 +11,7 @@ class Test8a : public KConfigSkeleton
 {
   public:
 
-    Test8a( KSharedConfig::Ptr config = KGlobal::sharedConfig() );
+    Test8a( KSharedConfig::Ptr config = TDEGlobal::sharedConfig() );
     ~Test8a();
 
     /**
diff --git a/tdecore/kconfig_compiler/tests/test8a.kcfg b/tdecore/kconfig_compiler/tests/test8a.kcfg
index 5ee87199f..53448b624 100644
--- a/tdecore/kconfig_compiler/tests/test8a.kcfg
+++ b/tdecore/kconfig_compiler/tests/test8a.kcfg
@@ -7,11 +7,11 @@
 
   <group name="Group">
     <entry name="Font" type="Font">
-      <default code="true">KGlobalSettings::generalFont()</default>
+      <default code="true">TDEGlobalSettings::generalFont()</default>
     </entry>
 
     <entry name="TitleFont" type="Font">
-      <default code="true">KGlobalSettings::windowTitleFont()</default>
+      <default code="true">TDEGlobalSettings::windowTitleFont()</default>
     </entry>
   </group>
 </kcfg>
-- 
cgit v1.2.1