1 files changed, 12 insertions, 12 deletions
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index c7b31588f..35abc648b 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -61,15 +61,15 @@ using KPIM::ProgressItem;
 class KMMsgMetaData
 {
 public:
-  KMMsgMetaData(KMMsgtqStatus atqStatus)
-    :mtqStatus(atqStatus), mSerNum(0) {}
-  KMMsgMetaData(KMMsgtqStatus atqStatus, TQ_UINT32 aSerNum)
-    :mtqStatus(atqStatus), mSerNum(aSerNum) {}
+  KMMsgMetaData(KMMsgStatus aStatus)
+    :mStatus(aStatus), mSerNum(0) {}
+  KMMsgMetaData(KMMsgStatus aStatus, TQ_UINT32 aSerNum)
+    :mStatus(aStatus), mSerNum(aSerNum) {}
   ~KMMsgMetaData() {};
-  KMMsgtqStatus status() const { return mtqStatus; }
+  KMMsgStatus status() const { return mStatus; }
   TQ_UINT32 serNum() const { return mSerNum; }
 private:
-  KMMsgtqStatus mtqStatus;
+  KMMsgStatus mStatus;
   TQ_UINT32 mSerNum;
 };
 
@@ -184,12 +184,12 @@ public:
    * Change the status of the message indicated by @p index
    * Overloaded function for the following one
    */
-  virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle);
+  virtual void seStatus(int idx, KMMsgStatus status, bool toggle);
 
   /**
    * Change the status of several messages indicated by @p ids
    */
-  virtual void setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle);
+  virtual void seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle);
 
   /** generates sets of uids */
   static TQStringList makeSets( TQValueList<ulong>&, bool sort = true);
@@ -241,7 +241,7 @@ public:
   /**
    * Convert message status to a list of IMAP flags
    */
-  static TQString statusToFlags(KMMsgtqStatus status, int supportedFalgs);
+  static TQString statusToFlags(KMMsgStatus status, int supportedFalgs);
 
   /**
    * Return the filename of the folder (reimplemented from KFolder)
@@ -290,7 +290,7 @@ public:
   /**
    * Mark the folder as already removed from the server
    * If set to true the folder will only be deleted locally
-   * This will recursively be applied to all tqchildren
+   * This will recursively be applied to all children
    */
   void setAlreadyRemoved(bool removed);
 
@@ -380,13 +380,13 @@ public slots:
    * Convert IMAP flags to a message status
    * @param newMsg specifies whether unseen messages are new or unread
    */
-  static void flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 );
+  static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 );
 
   /**
    * Convert IMAP seen flag to a message status.
    * @param newMsg specifies whether unseen messages are new or unread
    */
-  static void seenFlagTotqStatus( KMMsgBase *msg, int flags, bool newMsg = true );
+  static void seenFlagToStatus( KMMsgBase *msg, int flags, bool newMsg = true );
 
   /**
    * Connected to the result signal of the copy/move job