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

(limited to 'kmail/networkaccount.h')

diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 112cc71d..dd62b0cd 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -34,9 +34,9 @@
 #include <tqstring.h>
 
 class AccountManager;
-class KConfig/*Base*/;
+class TDEConfig/*Base*/;
 class KURL;
-namespace KIO {
+namespace TDEIO {
   class Slave;
   class MetaData;
 }
@@ -99,16 +99,16 @@ namespace KMail {
     virtual void setSieveConfig( const KMail::SieveConfig & config );
 
     /** Configure the slave by adding to the meta data map */
-    virtual KIO::MetaData slaveConfig() const;
+    virtual TDEIO::MetaData slaveConfig() const;
 
-    virtual void readConfig( /*const*/ KConfig/*Base*/ & config );
-    virtual void writeConfig( KConfig/*Base*/ & config ) /*const*/;
+    virtual void readConfig( /*const*/ TDEConfig/*Base*/ & config );
+    virtual void writeConfig( TDEConfig/*Base*/ & config ) /*const*/;
 
     /** @return an URL for this account */
     virtual KURL getUrl() const;
 
     /** @return the KIO slave for this account */
-    KIO::Slave * slave() const { return mSlave; }
+    TDEIO::Slave * slave() const { return mSlave; }
 
     /** Kill all jobs that are currently in progress */
     virtual void killAllJobs( bool disconnectSlave = false ) = 0;
@@ -128,7 +128,7 @@ namespace KMail {
 
   protected:
     KMail::SieveConfig mSieveConfig;
-    TQGuardedPtr<KIO::Slave> mSlave;
+    TQGuardedPtr<TDEIO::Slave> mSlave;
     TQString mLogin, mPasswd, mAuth, mHost;
     unsigned short int mPort;
     bool mStorePasswd : 1;
-- 
cgit v1.2.3