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

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

(limited to 'kmag/kmag.h')

diff --git a/kmag/kmag.h b/kmag/kmag.h
index 51de1b8..a834da5 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -49,7 +49,7 @@
   * full session management as well as using KActions.
   * @see KMainWindow
   * @see TDEApplication
-  * @see KConfig
+  * @see TDEConfig
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
   * @version KDevelop version 1.2 code generation
@@ -190,7 +190,7 @@ class KmagApp : public KMainWindow
     int edgesize;
 
     /// the configuration object of the application
-    KConfig *config;
+    TDEConfig *config;
 
     // KAction pointers to enable/disable actions
     KAction *fileNewWindow, *m_pSnapshot, *m_pCopy, *m_keyConf, *m_toolConf;
-- 
cgit v1.2.3