Rename old tq methods that no longer need a unique name

1 files changed, 18 insertions, 18 deletions

diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index a53a4be1b..c876e9a1e 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -119,7 +119,7 @@ int KMFolderMbox::open(const char *owner)
 
   if (!folder()->path().isEmpty())
   {
-     KMFolderIndex::IndextqStatus index_status = indextqStatus();
+     KMFolderIndex::IndexStatus index_status = indexStatus();
      // test if index file exists and is up-to-date
      if (KMFolderIndex::IndexOk != index_status)
      {
@@ -262,7 +262,7 @@ void KMFolderMbox::reallyDoClose(const char* owner)
   Q_UNUSED( owner );
   if (mAutoCreateIndex)
   {
-      if (KMFolderIndex::IndexOk != indextqStatus()) {
+      if (KMFolderIndex::IndexOk != indexStatus()) {
           kdDebug(5006) << "Critical error: " << location() <<
               " has been modified by an external application while KMail was running." << endl;
           //      exit(1); backed out due to broken nfs
@@ -521,7 +521,7 @@ int KMFolderMbox::unlock()
 
 
 //-----------------------------------------------------------------------------
-KMFolderIndex::IndextqStatus KMFolderMbox::indextqStatus()
+KMFolderIndex::IndexStatus KMFolderMbox::indexStatus()
 {
   if ( !mCompactable )
     return KMFolderIndex::IndexCorrupt;
@@ -555,8 +555,8 @@ int KMFolderMbox::createIndexFromContents()
   KMMsgInfo* mi;
   TQString msgStr;
   TQRegExp regexp(MSG_SEPERATOR_REGEX);
-  int i, num, numtqStatus;
-  short needtqStatus;
+  int i, num, numStatus;
+  short needStatus;
 
   assert(mStream != 0);
   rewind(mStream);
@@ -564,7 +564,7 @@ int KMFolderMbox::createIndexFromContents()
   mMsgList.clear();
 
   num     = -1;
-  numtqStatus= 11;
+  numStatus= 11;
   off_t offs = 0;
   size_t size = 0;
   dateStr = "";
@@ -578,7 +578,7 @@ int KMFolderMbox::createIndexFromContents()
   replyToAuxIdStr = "";
   referencesStr = "";
   msgIdStr = "";
-  needtqStatus = 3;
+  needStatus = 3;
   size_t sizeServer = 0;
   ulong uid = 0;
 
@@ -597,11 +597,11 @@ int KMFolderMbox::createIndexFromContents()
 
       if (num >= 0)
       {
-        if (numtqStatus <= 0)
+        if (numStatus <= 0)
         {
           msgStr = i18n("Creating index file: one message done", "Creating index file: %n messages done", num);
           emit statusMsg(msgStr);
-          numtqStatus = 10;
+          numStatus = 10;
         }
 
         if (size > 0)
@@ -682,14 +682,14 @@ int KMFolderMbox::createIndexFromContents()
                     replyToIdStr, replyToAuxIdStr, msgIdStr,
                     KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                     KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
-          mi->setqStatus(status, xstatus);
+          mi->seStatus(status, xstatus);
           mi->setDate( dateStr.stripWhiteSpace().data() );
           mi->setDirty(false);
           mMsgList.append(mi, mExportsSernums );
 
           *status = '\0';
           *xstatus = '\0';
-          needtqStatus = 3;
+          needStatus = 3;
           xmarkStr = "";
           replyToIdStr = "";
           replyToAuxIdStr = "";
@@ -701,12 +701,12 @@ int KMFolderMbox::createIndexFromContents()
           sizeServer = 0;
           uid = 0;
         }
-        else num--,numtqStatus++;
+        else num--,numStatus++;
       }
 
       offs = ftell(mStream);
       num++;
-      numtqStatus--;
+      numStatus--;
       inHeader = true;
       continue;
     }
@@ -727,19 +727,19 @@ int KMFolderMbox::createIndexFromContents()
     /* -sanders Make all messages read when auto-recreating index */
     /* Reverted, as it breaks reading the sent mail status, for example.
        -till */
-    if ((needtqStatus & 1) && strncasecmp(line, "Status:", 7) == 0)
+    if ((needStatus & 1) && strncasecmp(line, "Status:", 7) == 0)
     {
       for(i=0; i<4 && line[i+8] > ' '; i++)
         status[i] = line[i+8];
       status[i] = '\0';
-      needtqStatus &= ~1;
+      needStatus &= ~1;
     }
-    else if ((needtqStatus & 2) && strncasecmp(line, "X-Status:", 9)==0)
+    else if ((needStatus & 2) && strncasecmp(line, "X-Status:", 9)==0)
     {
       for(i=0; i<4 && line[i+10] > ' '; i++)
         xstatus[i] = line[i+10];
       xstatus[i] = '\0';
-      needtqStatus &= ~2;
+      needStatus &= ~2;
     }
     else if (strncasecmp(line,"X-KMail-Mark:",13)==0)
         xmarkStr = TQCString(line+13);
@@ -1237,7 +1237,7 @@ int KMFolderMbox::compact( bool silent )
   // Note that job autodeletes itself.
 
   // If this is the current folder, the changed signal will ultimately call
-  // KMHeaders::setFolderInfotqStatus which will override the message, so save/restore it
+  // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
   TQString statusMsg = BroadcastStatus::instance()->statusMsg();
   emit changed();
   BroadcastStatus::instance()->seStatusMsg( statusMsg );