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

(limited to 'kmail/popaccount.h')

diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index 51cb84520..afa0acf27 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -13,7 +13,7 @@
 class KMPopHeaders;
 class KMMessage;
 class TQDataStream;
-namespace KIO {
+namespace TDEIO {
   class MetaData;
   class Slave;
   class SimpleJob;
@@ -33,7 +33,7 @@ public:
   virtual ~PopAccount();
   virtual void init(void);
 
-  virtual KIO::MetaData slaveConfig() const;
+  virtual TDEIO::MetaData slaveConfig() const;
 
   /** A weak assignment operator */
   virtual void pseudoAssign( const KMAccount * a );
@@ -90,8 +90,8 @@ public:
    * Inherited methods.
    */
   virtual TQString type(void) const;
-  virtual void readConfig(KConfig&);
-  virtual void writeConfig(KConfig&);
+  virtual void readConfig(TDEConfig&);
+  virtual void writeConfig(TDEConfig&);
   virtual void processNewMail(bool _interactive);
 
   virtual void killAllJobs( bool disconnectSlave=false ); // NOOP currently
@@ -130,7 +130,7 @@ protected:
   bool    mFilterOnServer;
   unsigned int mFilterOnServerCheckSize;
 
-  KIO::SimpleJob *job;
+  TDEIO::SimpleJob *job;
   //Map of ID's vs. sizes of messages which should be downloaded
   TQMap<TQString, int> mMsgsPendingDownload;
 
@@ -194,19 +194,19 @@ protected slots:
    * A messages has been retrieved successfully. The next data belongs to the
    * next message.
    */
-  void slotMsgRetrieved(KIO::Job*, const TQString &);
+  void slotMsgRetrieved(TDEIO::Job*, const TQString &);
 
   /**
    * New data has arrived append it to the end of the current message
    */
-  void slotData( KIO::Job*, const TQByteArray &);
+  void slotData( TDEIO::Job*, const TQByteArray &);
 
   /**
    * Finished downloading the current kio job, either due to an error
    * or because the job has been canceled or because the complete message
    * has been downloaded
    */
-  void slotResult( KIO::Job* );
+  void slotResult( TDEIO::Job* );
 
   /**
    * Cleans up after a user cancels the current job
@@ -227,7 +227,7 @@ protected slots:
   /**
    * Slave error handling
    */
-  void slotSlaveError(KIO::Slave *, int, const TQString &);
+  void slotSlaveError(TDEIO::Slave *, int, const TQString &);
 
   /**
    * If there are more headers to be downloaded then start a new kio job
-- 
cgit v1.2.1