1 files changed, 13 insertions, 13 deletions

diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 63dc91fb5..53d7f66d8 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread()
     if (!(msgBase = getMsgBase(i))) continue;
     if (msgBase->isNew())
     {
-      msgBase->setqStatus(KMMsgStatusUnread);
+      msgBase->seStatus(KMMsgStatusUnread);
       msgBase->setDirty(true);
     }
   }
@@ -503,7 +503,7 @@ KMMessage* FolderStorage::getMsg(int idx)
         kdDebug(5006) << "Error: " << location() <<
           " Index file is inconsistent with folder file. This should never happen." << endl;
 
-        // We can't recreate the index at this point, since that would tqinvalidate the current
+        // We can't recreate the index at this point, since that would invalidate the current
         // message list and delete KMMsgBase or KMMessage objects that are in use.
         // Do it later in KMFolderIndex::readIndexHeader() instead.
         mCompactable = false; // Don't compact
@@ -861,18 +861,18 @@ bool FolderStorage::isCloseToQuota() const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
-  const KMMsgtqStatus newtqStatus, int idx)
+void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
+  const KMMsgStatus newStatus, int idx)
 {
   int oldUnread = 0;
   int newUnread = 0;
 
-  if (((oldtqStatus & KMMsgStatusUnread || oldtqStatus & KMMsgStatusNew) &&
-      !(oldtqStatus & KMMsgStatusIgnored)) ||
+  if (((oldStatus & KMMsgStatusUnread || oldStatus & KMMsgStatusNew) &&
+      !(oldStatus & KMMsgStatusIgnored)) ||
       (folder() == kmkernel->outboxFolder()))
     oldUnread = 1;
-  if (((newtqStatus & KMMsgStatusUnread || newtqStatus & KMMsgStatusNew) &&
-      !(newtqStatus & KMMsgStatusIgnored)) ||
+  if (((newStatus & KMMsgStatusUnread || newStatus & KMMsgStatusNew) &&
+      !(newStatus & KMMsgStatusIgnored)) ||
       (folder() == kmkernel->outboxFolder()))
     newUnread = 1;
   int deltaUnread = newUnread - oldUnread;
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setqStatus(int idx, KMMsgtqStatus status, bool toggle)
+void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   KMMsgBase *msg = getMsgBase(idx);
   if ( msg ) {
     if (toggle)
-      msg->toggletqStatus(status, idx);
+      msg->toggleStatus(status, idx);
     else
-      msg->setqStatus(status, idx);
+      msg->seStatus(status, idx);
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle)
+void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
 {
   for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it )
   {
-    FolderStorage::setqStatus(*it, status, toggle);
+    FolderStorage::seStatus(*it, status, toggle);
   }
 }