From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:35:07 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 tdecore/kglobal.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tdecore/kglobal.h')

diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index 361129e2b..22877c8ce 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -22,7 +22,7 @@
 #include <kinstance.h> // KDE4: class TDEInstance is enough here
 
 class KCharsets;
-class KConfig;
+class TDEConfig;
 class KSharedConfig;
 class KIconLoader;
 class TDEHardwareDevices;
@@ -65,7 +65,7 @@ public:
      *  Returns the general config object.
      * @return the global configuration object.
      */
-    static KConfig		*config();
+    static TDEConfig		*config();
 
     /**
      *  Returns the general config object.
-- 
cgit v1.2.1