Rename old tq methods that no longer need a unique name

1 files changed, 12 insertions, 12 deletions

diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index 43a101027..6ad1315dc 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -38,7 +38,7 @@ class KMFolderIndex;
     to Unread or New. This is done in KMMsgBase::isRead()
     and related getters. So we can preserve the state
     when switching a thread to Ignored and back. */
-enum MsgtqStatus
+enum MsgStatus
 {
     KMMsgStatusUnknown =           0x00000000,
     KMMsgStatusNew =               0x00000001,
@@ -62,7 +62,7 @@ enum MsgtqStatus
     KMMsgStatusHasNoInvitation =   0x00040000
 };
 
-typedef uint KMMsgtqStatus;
+typedef uint KMMsgStatus;
 
 /** The old status format, only one at a time possible. Needed
     for upgrade path purposes. */
@@ -80,7 +80,7 @@ typedef enum
     KMLegacyMsgStatusQueued='Q',
     KMLegacyMsgStatusSent='S',
     KMLegacyMsgStatusFlag='G'
-} KMLegacyMsgtqStatus;
+} KMLegacyMsgStatus;
 
 
 
@@ -158,7 +158,7 @@ public:
   void setParent(KMFolder* p) { mParent = p; }
 
   /** Convert the given message status to a string. */
-  static TQCString statusToStr(const KMMsgtqStatus status);
+  static TQCString statusToStr(const KMMsgStatus status);
 
   /** Convert the given message status to a string. */
   TQString statusToSortRank();
@@ -173,7 +173,7 @@ public:
   virtual bool isNew(void) const;
 
   /** Returns TRUE if status is unknown. */
-  virtual bool isOfUnknowntqStatus(void) const;
+  virtual bool isOfUnknownStatus(void) const;
 
   /** Returns TRUE if status is old. */
   virtual bool isOld(void) const;
@@ -215,14 +215,14 @@ public:
   virtual bool isHam(void) const;
 
 
-  /** tqStatus of the message. */
-  virtual KMMsgtqStatus status(void) const = 0;
+  /** Status of the message. */
+  virtual KMMsgStatus status(void) const = 0;
 
   /** Set status and mark dirty.  Optional optimization: @p idx may
    * specify the index of this message within the parent folder. */
-  virtual void setqStatus(const KMMsgtqStatus status, int idx = -1);
-  virtual void toggletqStatus(const KMMsgtqStatus status, int idx = -1);
-  virtual void setqStatus(const char* statusField, const char* xstatusField=0);
+  virtual void seStatus(const KMMsgStatus status, int idx = -1);
+  virtual void toggleStatus(const KMMsgStatus status, int idx = -1);
+  virtual void seStatus(const char* statusField, const char* xstatusField=0);
 
   /** Encryption status of the message. */
   virtual KMMsgEncryptionState encryptionState() const = 0;
@@ -450,10 +450,10 @@ protected:
   short mIndexLength;
   bool mDirty;
   bool mEnableUndo;
-  mutable KMMsgtqStatus mtqStatus;
+  mutable KMMsgStatus mStatus;
   // This is kept to provide an upgrade path from the the old single status
   // to the new multiple status scheme.
-  mutable KMLegacyMsgtqStatus mLegacytqStatus;
+  mutable KMLegacyMsgStatus mLegacyStatus;
 
 public:
   enum MsgPartType