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/klocale.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tdecore/klocale.h')

diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index ce9dad46b..42619afd4 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -31,7 +31,7 @@ class TQDate;
 class TQTime;
 class TQDateTime;
 
-class KGlobal;
+class TDEGlobal;
 class KConfig;
 class KConfigBase;
 class KLocalePrivate;
@@ -123,7 +123,7 @@ inline TQString tr2i18n(const char* message, const char* =0) {
   */
 class TDECORE_EXPORT KLocale
 {
-  friend class KGlobal; // for initInstance()
+  friend class TDEGlobal; // for initInstance()
 public:
   /**
    * Constructs a KLocale with the given catalog name.
@@ -1173,7 +1173,7 @@ private:
 
 protected:
   /**
-   * @internal Creates a KLocale object for KGlobal and inits the locale
+   * @internal Creates a KLocale object for TDEGlobal and inits the locale
    * pointer.
    */
   static void initInstance();
-- 
cgit v1.2.1