Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

1 files changed, 29 insertions, 29 deletions

diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 26e5f5e3d..ec08ea5f4 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -34,14 +34,14 @@
 
 class AccountManager;
 class KMFolder;
-class KConfig/*Base*/;
+class TDEConfig/*Base*/;
 class KMMessagePart;
 class DwBodyPart;
 class DwMessage;
 class FolderStorage;
 template <typename T> class TQValueVector;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -97,10 +97,10 @@ namespace KMail {
     virtual void setListOnlyOpenFolders( bool only );
 
     /** Configure the slave by adding to the meta data map */
-    virtual KIO::MetaData slaveConfig() const;
+    virtual TDEIO::MetaData slaveConfig() const;
 
-    virtual void readConfig( KConfig& config );
-    virtual void writeConfig( KConfig& config );
+    virtual void readConfig( TDEConfig& config );
+    virtual void writeConfig( TDEConfig& config );
 
     /**
      * The state of the kioslave connection
@@ -119,7 +119,7 @@ namespace KMail {
     /**
      * Connect to the server, if no connection is active
      * Returns Connected (ok), Error (ko) or Connecting - which means
-     * that one should wait for the slaveConnected signal from KIO::Scheduler
+     * that one should wait for the slaveConnected signal from TDEIO::Scheduler
      * before proceeding.
      */
     ConnectionState makeConnection();
@@ -164,17 +164,17 @@ namespace KMail {
       bool onlySubscribed, quiet, cancellable;
     };
 
-    typedef TQMap<KIO::Job *, jobData>::Iterator JobIterator;
+    typedef TQMap<TDEIO::Job *, jobData>::Iterator JobIterator;
     /**
      * Call this when starting a new job
      */
-    void insertJob( KIO::Job* job, const jobData& data ) {
+    void insertJob( TDEIO::Job* job, const jobData& data ) {
       mapJobData.insert( job, data );
     }
     /**
      * Look for the jobData related to a given job. Compare with end()
      */
-    JobIterator findJob( KIO::Job* job ) { return mapJobData.find( job ); }
+    JobIterator findJob( TDEIO::Job* job ) { return mapJobData.find( job ); }
     JobIterator jobsEnd() { return mapJobData.end(); }
     /**
      * Call this when a job is finished.
@@ -182,7 +182,7 @@ namespace KMail {
      */
     void removeJob( JobIterator& it );
 
-    void removeJob( KIO::Job* job );
+    void removeJob( TDEIO::Job* job );
 
     /**
      * Subscribe (@p subscribe = TRUE) / Unsubscribe the folder
@@ -322,7 +322,7 @@ namespace KMail {
      * React to an error from the job. Uses job->error and job->errorString and calls
      * the protected virtual handleJobError with them. See handleError below for details.
      */
-    bool handleJobError( KIO::Job* job, const TQString& context, bool abortSync = false );
+    bool handleJobError( TDEIO::Job* job, const TQString& context, bool abortSync = false );
 
     /**
      * Returns the root folder of this account
@@ -425,29 +425,29 @@ namespace KMail {
      * is called when the changeSubscription has finished
      * emits subscriptionChanged
      */
-    void slotSubscriptionResult(KIO::Job * job);
+    void slotSubscriptionResult(TDEIO::Job * job);
 
   protected slots:
     virtual void slotCheckQueuedFolders();
 
     /// Handle a message coming from the KIO scheduler saying that the slave is now connected
-    void slotSchedulerSlaveConnected(KIO::Slave *aSlave);
+    void slotSchedulerSlaveConnected(TDEIO::Slave *aSlave);
     /// Handle an error coming from the KIO scheduler
-    void slotSchedulerSlaveError(KIO::Slave *aSlave, int, const TQString &errorMsg);
+    void slotSchedulerSlaveError(TDEIO::Slave *aSlave, int, const TQString &errorMsg);
 
     /**
      * Only delete information about the job and ignore write errors
      */
-    void slotSetStatusResult(KIO::Job * job);
+    void slotSetStatusResult(TDEIO::Job * job);
 
     /// Result of getUserRights() job
-    void slotGetUserRightsResult( KIO::Job* _job );
+    void slotGetUserRightsResult( TDEIO::Job* _job );
 
     /// Result of getACL() job
-    void slotGetACLResult( KIO::Job* _job );
+    void slotGetACLResult( TDEIO::Job* _job );
 
     /// Result of getStorageQuotaInfo() job
-    void slotGetStorageQuotaInfoResult( KIO::Job* _job );
+    void slotGetStorageQuotaInfoResult( TDEIO::Job* _job );
 
     /**
      * Send a NOOP command regularly to keep the slave from disconnecting
@@ -466,10 +466,10 @@ namespace KMail {
     /**
      * Only delete information about the job
      */
-    void slotSimpleResult(KIO::Job * job);
+    void slotSimpleResult(TDEIO::Job * job);
 
     /** Gets and parses the namespaces */
-    void slotNamespaceResult( KIO::Job*, const TQString& str );
+    void slotNamespaceResult( TDEIO::Job*, const TQString& str );
 
     /**
      * Saves the fetched namespaces
@@ -479,7 +479,7 @@ namespace KMail {
     /**
      * Saves the capabilities list
      */
-    void slotCapabilitiesResult( KIO::Job*, const TQString& result );
+    void slotCapabilitiesResult( TDEIO::Job*, const TQString& result );
 
   protected:
 
@@ -499,10 +499,10 @@ namespace KMail {
      * @param abortSync if true, abort sync in all cases (see above). If false, ask the user (when possible).
      * @return false when aborting, true when continuing
      */
-    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 );
 
-    /** Handle an error during KIO::put - helper method */
-    bool handlePutError( KIO::Job* job, jobData& jd, KMFolder* folder );
+    /** Handle an error during TDEIO::put - helper method */
+    bool handlePutError( TDEIO::Job* job, jobData& jd, KMFolder* folder );
 
     virtual TQString protocol() const;
     virtual unsigned short int defaultPort() const;
@@ -519,13 +519,13 @@ namespace KMail {
     // used for writing the blacklist out to the config file
     TQStringList locallyBlacklistedFolders() const;
     void localBlacklistFromStringList( const TQStringList & );
-    TQString prettifyQuotaError( const TQString& _error, KIO::Job * job );
+    TQString prettifyQuotaError( const TQString& _error, TDEIO::Job * job );
 
   protected:
     TQPtrList<TQGuardedPtr<KMFolder> > mOpenFolders;
     TQStringList mSubfolderNames, mSubfolderPaths,
         mSubfolderMimeTypes, mSubfolderAttributes;
-    TQMap<KIO::Job *, jobData> mapJobData;
+    TQMap<TDEIO::Job *, jobData> mapJobData;
     /** used to detect when the slave has not been used for a while */
     TQTimer mIdleTimer;
     /** used to send a noop to the slave in regular intervals to keep it from disonnecting */
@@ -579,7 +579,7 @@ namespace KMail {
      * Emitted when the slave managed or failed to connect
      * This is always emitted at some point after makeConnection returned Connecting.
      * @param errorCode 0 for success, != 0 in case of error
-     * @param errorMsg if errorCode is != 0, this goes with errorCode to call KIO::buildErrorString
+     * @param errorMsg if errorCode is != 0, this goes with errorCode to call TDEIO::buildErrorString
      */
     void connectionResult( int errorCode, const TQString& errorMsg );
 
@@ -617,7 +617,7 @@ namespace KMail {
      * @param job the job that was used for doing so (can be used to display errors)
      * @param entries the ACL list. Make your copy of it, it comes from the job.
      */
-    void receivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& entries );
+    void receivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& entries );
 
     /**
      * Emitted when the getQuotaInfo job is done,
@@ -627,7 +627,7 @@ namespace KMail {
      * @param info The quota information for this folder. Make your copy of it,
      * it comes from the job.
      */
-    void receivedStorageQuotaInfo( KMFolder* folder, KIO::Job* job, const KMail::QuotaInfo& entries );
+    void receivedStorageQuotaInfo( KMFolder* folder, TDEIO::Job* job, const KMail::QuotaInfo& entries );
 
     /**
      * Emitted when we got the namespaces