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

(limited to 'tdecore/kcharsets.h')

diff --git a/tdecore/kcharsets.h b/tdecore/kcharsets.h
index 2816e4fcd..da96643ff 100644
--- a/tdecore/kcharsets.h
+++ b/tdecore/kcharsets.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KGlobal;
+class TDEGlobal;
 class KCharsetsPrivate;
 
 class TQTextCodec;
@@ -42,11 +42,11 @@ class TQTextCodec;
  */
 class TDECORE_EXPORT KCharsets
 {
-    friend class KGlobal;
+    friend class TDEGlobal;
 
 protected:
     /** Protected constructor. If you need the kcharsets object, use
- KGlobal::charsets() instead.
+ TDEGlobal::charsets() instead.
     */
     KCharsets();
 
-- 
cgit v1.2.3