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

---
 kmail/kmkernel.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kmail/kmkernel.h')

diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 471a77400..fb01231bf 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -21,7 +21,7 @@
 #define kmkernel KMKernel::self()
 #define kmconfig KMKernel::config()
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 namespace KWallet {
@@ -249,7 +249,7 @@ public:
   /** normal control stuff */
 
   static KMKernel *self() { return mySelf; }
-  static KConfig *config();
+  static TDEConfig *config();
 
   void init();
   void readConfig();
@@ -257,7 +257,7 @@ public:
   void recreateCorruptIndexFiles();
   void testDir(const char *_name);
   void recoverDeadLetters();
-  void initFolders(KConfig* cfg);
+  void initFolders(TDEConfig* cfg);
   void closeAllKMailWindows();
   void cleanup(void);
   void quit();
@@ -416,7 +416,7 @@ public slots:
   /// Save contents of all open composer widnows to ~/dead.letter
   void dumpDeadLetters();
 
-  /** Call this slot instead of directly KConfig::sync() to
+  /** Call this slot instead of directly TDEConfig::sync() to
       minimize the overall config writes. Calling this slot will
       schedule a sync of the application config file using a timer, so
       that many consecutive calls can be condensed into a single
@@ -432,8 +432,8 @@ public slots:
   void slotConfigChanged();
 
 protected slots:
-  void slotDataReq(KIO::Job*,TQByteArray&);
-  void slotResult(KIO::Job*);
+  void slotDataReq(TDEIO::Job*,TQByteArray&);
+  void slotResult(TDEIO::Job*);
 
 signals:
   void configChanged();
@@ -470,7 +470,7 @@ private:
     TQByteArray data;
     int offset;
   };
-  TQMap<KIO::Job *, putData> mPutJobs;
+  TQMap<TDEIO::Job *, putData> mPutJobs;
   /** previous KMail version. If different from current,
       the user has just updated. read from config */
   TQString the_previousVersion;
-- 
cgit v1.2.1