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

(limited to 'kmail/kmacctimap.h')

diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index 455ab931a..99f07f168 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -31,7 +31,7 @@ namespace KMail {
   class ImapJob;
   class ActionScheduler;
 }
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 class FolderStorage;
@@ -83,7 +83,7 @@ public:
    * manager when a new account is created. The config group is
    * already properly set by the caller.
    */
-  virtual void readConfig(KConfig& config);
+  virtual void readConfig(TDEConfig& config);
 
   /**
    * Returns the root folder of this account
@@ -109,7 +109,7 @@ protected:
    * Handle an error coming from a KIO job
    * See ImapAccountBase::handleJobError for details.
    */
-  virtual bool handleError( int error, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync = false );
+  virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );
   virtual void cancelMailCheck();
 
   TQPtrList<KMail::ImapJob> mJobList;
-- 
cgit v1.2.1