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.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tdecore/kglobal.cpp')

diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index c51f13e7f..9759edbcf 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -60,7 +60,7 @@ KStandardDirs *TDEGlobal::dirs()
     return _instance->dirs();
 }
 
-KConfig	*TDEGlobal::config()
+TDEConfig	*TDEGlobal::config()
 {
     MYASSERT(_instance);
 
-- 
cgit v1.2.3