1 files changed, 21 insertions, 21 deletions

diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index 6f10bfe5..e8e42820 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -34,7 +34,7 @@
 
 #include "imapaccountbase.h"
 
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
 
 class KMFolderCachedImap;
 class KMFolderTreeItem;
@@ -72,7 +72,7 @@ public:
   /**
    * Inherited methods.
    */
-  virtual QString type() const;
+  virtual TQString type() const;
   virtual void processNewMail( bool interactive );
 
   /**
@@ -114,56 +114,56 @@ public:
    * Remember that a folder got explicitely deleted - NOT including all child folders
    * This is used when renaming a folder.
    */
-  void addDeletedFolder( const QString& imapPath );
+  void addDeletedFolder( const TQString& imapPath );
 
   /**
    * Ask if a folder was explicitely deleted in this session
    */
-  bool isDeletedFolder( const QString& subFolderPath ) const;
+  bool isDeletedFolder( const TQString& subFolderPath ) const;
 
   /**
    * Ask if a folder was explicitely deleted in a previous session
    */
-  bool isPreviouslyDeletedFolder( const QString& subFolderPath ) const;
+  bool isPreviouslyDeletedFolder( const TQString& subFolderPath ) const;
 
   /**
    * return the imap path to the deleted folder, as well as the paths for any child folders
    */
-  QStringList deletedFolderPaths( const QString& subFolderPath ) const;
+  TQStringList deletedFolderPaths( const TQString& subFolderPath ) const;
 
   /**
    * Remove folder from the "deleted folders" list
    */
-  void removeDeletedFolder( const QString& subFolderPath );
+  void removeDeletedFolder( const TQString& subFolderPath );
 
   /**
    * Remember that a folder was renamed
    */
-  void addRenamedFolder( const QString& subFolderPath,
-                         const QString& oldLabel, const QString& newName );
+  void addRenamedFolder( const TQString& subFolderPath,
+                         const TQString& oldLabel, const TQString& newName );
 
   /**
    * Remove folder from "renamed folders" list
    * Warning: @p subFolderPath is the OLD path
    */
-  void removeRenamedFolder( const QString& subFolderPath );
+  void removeRenamedFolder( const TQString& subFolderPath );
 
   struct RenamedFolder {
     RenamedFolder() {} // for QMap
-    RenamedFolder( const QString& oldLabel, const QString& newName )
+    RenamedFolder( const TQString& oldLabel, const TQString& newName )
       : mOldLabel( oldLabel ), mNewName( newName ) {}
-    QString mOldLabel;
-    QString mNewName;
+    TQString mOldLabel;
+    TQString mNewName;
   };
 
   /**
    * Returns new name for folder if it was renamed
    */
-  QString renamedFolder( const QString& imapPath ) const;
+  TQString renamedFolder( const TQString& imapPath ) const;
   /**
    * Returns the list of folders that were renamed
    */
-  const QMap<QString, RenamedFolder>& renamedFolders() const { return mRenamedFolders; }
+  const TQMap<TQString, RenamedFolder>& renamedFolders() const { return mRenamedFolders; }
 
   /**
    * Add a folder's unread count to the new "unread messages count", done during a sync after getting new mail
@@ -201,7 +201,7 @@ public:
 
 protected:
   friend class ::AccountManager;
-  KMAcctCachedImap(AccountManager* owner, const QString& accountName, uint id);
+  KMAcctCachedImap(AccountManager* owner, const TQString& accountName, uint id);
 
 protected slots:
   /** new-mail-notification for the current folder (is called via folderComplete) */
@@ -212,15 +212,15 @@ protected slots:
   virtual void slotCheckQueuedFolders();
 
 private:
-  QValueList<KMFolderCachedImap*> killAllJobsInternal( bool disconnectSlave );
+  TQValueList<KMFolderCachedImap*> killAllJobsInternal( bool disconnectSlave );
   void processNewMail( KMFolderCachedImap* folder, bool recurse );
 
 private:
-  QPtrList<CachedImapJob> mJobList;
+  TQPtrList<CachedImapJob> mJobList;
   KMFolderCachedImap *mFolder;
-  QStringList mDeletedFolders; // folders deleted in this session
-  QStringList mPreviouslyDeletedFolders; // folders deleted in a previous session
-  QMap<QString, RenamedFolder> mRenamedFolders;
+  TQStringList mDeletedFolders; // folders deleted in this session
+  TQStringList mPreviouslyDeletedFolders; // folders deleted in a previous session
+  TQMap<TQString, RenamedFolder> mRenamedFolders;
   bool mAnnotationCheckPassed;
 
   GroupwareType mGroupwareType;