Rename a number of old tq methods that are no longer tq specific

1 files changed, 17 insertions, 17 deletions

diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp
index 8ce5f7cf3..c2ce09582 100644
--- a/kmail/kmmsginfo.cpp
+++ b/kmail/kmmsginfo.cpp
@@ -154,7 +154,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMsgInfo& other)
         delete kd;
         kd = 0;
     }
-    mtqStatus = other.status();
+    mStatus = other.status();
     return *this;
 }
 #endif
@@ -174,7 +174,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg)
     kd->strippedSubjectMD5 = msg.strippedSubjectMD5();
     kd->msgIdMD5 = msg.msgIdMD5();
     kd->xmark = msg.xmark();
-    mtqStatus = msg.status();
+    mStatus = msg.status();
     kd->folderOffset = msg.folderOffset();
     kd->msgSize = msg.msgSize();
     kd->date = msg.date();
@@ -192,7 +192,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg)
 //-----------------------------------------------------------------------------
 void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
                      const TQCString& aTo, time_t aDate,
-                     KMMsgtqStatus atqStatus, const TQCString& aXMark,
+                     KMMsgStatus aStatus, const TQCString& aXMark,
                      const TQCString& replyToId, const TQCString& replyToAuxId,
                      const TQCString& msgId,
                      KMMsgEncryptionState encryptionState,
@@ -216,7 +216,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
     kd->msgIdMD5 = base64EncodedMD5( msgId );
     kd->xmark = aXMark;
     kd->folderOffset = aFolderOffset;
-    mtqStatus    = atqStatus;
+    mStatus    = aStatus;
     kd->msgSize = aMsgSize;
     kd->date = aDate;
     kd->file = "";
@@ -232,7 +232,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
 
 void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
                      const TQCString& aTo, time_t aDate,
-                     KMMsgtqStatus atqStatus, const TQCString& aXMark,
+                     KMMsgStatus aStatus, const TQCString& aXMark,
                      const TQCString& replyToId, const TQCString& replyToAuxId,
                      const TQCString& msgId,
                      const TQCString& aFileName,
@@ -244,7 +244,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
              size_t aMsgSizeServer, ulong aUID)
 {
   // use the "normal" init for most stuff
-  init( aSubject, aFrom, aTo, aDate, atqStatus, aXMark, replyToId, replyToAuxId,
+  init( aSubject, aFrom, aTo, aDate, aStatus, aXMark, replyToId, replyToAuxId,
         msgId, encryptionState, signatureState, mdnSentState, prefCharset,
         (unsigned long)0, aMsgSize, aMsgSizeServer, aUID );
   kd->file = aFileName;
@@ -477,16 +477,16 @@ void KMMsgInfo::setMDNSentState( const KMMsgMDNSentState s, int idx )
 }
 
 //-----------------------------------------------------------------------------
-KMMsgtqStatus KMMsgInfo::status(void) const
+KMMsgStatus KMMsgInfo::status(void) const
 {
-    if (mtqStatus == KMMsgStatusUnknown) {
-        KMMsgtqStatus st = (KMMsgtqStatus)getLongPart(MsgStatusPart);
+    if (mStatus == KMMsgStatusUnknown) {
+        KMMsgStatus st = (KMMsgStatus)getLongPart(MsgStatusPart);
         if (!st) {
             // We are opening an old index for the first time, get the legacy
             // status and merge it in.
-            mLegacytqStatus = (KMLegacyMsgtqStatus)getLongPart(MsgLegacyStatusPart);
+            mLegacyStatus = (KMLegacyMsgStatus)getLongPart(MsgLegacyStatusPart);
             st = KMMsgStatusRead;
-            switch (mLegacytqStatus) {
+            switch (mLegacyStatus) {
                 case KMLegacyMsgStatusUnknown:
                     st = KMMsgStatusUnknown;
                     break;
@@ -525,9 +525,9 @@ KMMsgtqStatus KMMsgInfo::status(void) const
             }
 
         }
-        mtqStatus = st;
+        mStatus = st;
     }
-    return mtqStatus;
+    return mStatus;
 }
 
 
@@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgInfo::setqStatus(const KMMsgtqStatus atqStatus, int idx)
+void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx)
 {
-    if(atqStatus == status())
+    if(aStatus == status())
         return;
-    KMMsgBase::setqStatus(atqStatus, idx); //base does more "stuff"
+    KMMsgBase::seStatus(aStatus, idx); //base does more "stuff"
 }
 
 //-----------------------------------------------------------------------------
@@ -716,7 +716,7 @@ void KMMsgInfo::compat_fromOldIndexString(const TQCString& str, bool toUtf8)
     kd->folderOffset = str.mid(2,9).toULong();
     kd->msgSize = str.mid(12,9).toULong();
     kd->date = (time_t)str.mid(22,10).toULong();
-    mtqStatus = (KMMsgtqStatus)str.at(0);
+    mStatus = (KMMsgStatus)str.at(0);
     if (toUtf8) {
         kd->subject = str.mid(37, 100).stripWhiteSpace();
         kd->fromStrip = str.mid(138, 50).stripWhiteSpace();