1 files changed, 21 insertions, 21 deletions

diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 78724d502..6744e136e 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->setStatus(KMMsgStatusUnread);
+      msgBase->seStatus(KMMsgStatusUnread);
       msgBase->setDirty(true);
     }
   }
@@ -197,7 +197,7 @@ void FolderStorage::markUnreadAsRead()
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 }
 
@@ -283,7 +283,7 @@ void FolderStorage::slotEmitChangedTimer()
 //-----------------------------------------------------------------------------
 void FolderStorage::emitMsgAddedSignals(int idx)
 {
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder() , idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder() , idx );
   if (!mQuiet) {
     emit msgAdded(idx);
   } else {
@@ -388,7 +388,7 @@ void FolderStorage::removeMsg(int idx, bool)
 
   KMMsgBase* mb = getMsgBase(idx);
 
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
   if (serNum != 0)
     emit msgRemoved( folder(), serNum );
   mb = takeIndexEntry( idx );
@@ -430,7 +430,7 @@ KMMessage* FolderStorage::take(int idx)
   mb = getMsgBase(idx);
   if (!mb) return 0;
   if (!mb->isMessage()) readMsg(idx);
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
   emit msgRemoved( folder(), serNum );
 
   msg = (KMMessage*)takeIndexEntry(idx);
@@ -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 invalidate the current
+        // We can't recreate the index at this point, since that would tqinvalidate 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
@@ -844,7 +844,7 @@ int FolderStorage::countUnread()
   return (unread > 0) ? unread : 0;
 }
 
-Q_INT64 FolderStorage::folderSize() const
+TQ_INT64 FolderStorage::folderSize() const
 {
     if ( mSize != -1 ) {
         return mSize;
@@ -889,7 +889,7 @@ void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
       }
       mChanged = true;
     }
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(folder(), idx);
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(folder(), idx);
     emit msgChanged( folder(), serNum, deltaUnread );
   }
 }
@@ -977,21 +977,21 @@ void FolderStorage::readFolderIdsFile()
 {
   if ( !mExportsSernums ) return;
   if ( KMMsgDict::mutableInstance()->readFolderIds( *this ) == -1 ) {
-    invalidateFolder();
+    tqinvalidateFolder();
   }
   if ( !KMMsgDict::mutableInstance()->hasFolderIds( *this ) ) {
-    invalidateFolder();
+    tqinvalidateFolder();
   }
 }
 
-void FolderStorage::invalidateFolder()
+void FolderStorage::tqinvalidateFolder()
 {
   if ( !mExportsSernums ) return;
   unlink(TQFile::encodeName( indexLocation()) + ".sorted");
   unlink(TQFile::encodeName( indexLocation()) + ".ids");
   fillMessageDict();
   KMMsgDict::mutableInstance()->writeFolderIds( *this );
-  emit invalidated( folder() );
+  emit tqinvalidated( folder() );
 }
 
 
@@ -1022,10 +1022,10 @@ int FolderStorage::appendToFolderIdsFile( int idx )
   return ret;
 }
 
-void FolderStorage::replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
+void FolderStorage::tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
 {
   if ( !mExportsSernums ) return;
-  KMMsgDict::mutableInstance()->replace( sernum, msg, idx );
+  KMMsgDict::mutableInstance()->tqreplace( sernum, msg, idx );
 }
 
 void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setStatus(int idx, KMMsgStatus status, bool toggle)
+void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   KMMsgBase *msg = getMsgBase(idx);
   if ( msg ) {
     if (toggle)
       msg->toggleStatus(status, idx);
     else
-      msg->setStatus(status, idx);
+      msg->seStatus(status, idx);
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setStatus(TQValueList<int>& ids, KMMsgStatus 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::setStatus(*it, status, toggle);
+    FolderStorage::seStatus(*it, status, toggle);
   }
 }
 
@@ -1135,11 +1135,11 @@ void FolderStorage::slotProcessNextSearchBatch()
 {
   if ( !mSearchPattern )
     return;
-  TQValueList<Q_UINT32> matchingSerNums;
+  TQValueList<TQ_UINT32> matchingSerNums;
   const int end = QMIN( mCurrentSearchedMsg + 15, count() );
   for ( int i = mCurrentSearchedMsg; i < end; ++i )
   {
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
     if ( mSearchPattern->matches( serNum ) )
       matchingSerNums.append( serNum );
   }
@@ -1151,7 +1151,7 @@ void FolderStorage::slotProcessNextSearchBatch()
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
+void FolderStorage::search( const KMSearchPattern* pattern, TQ_UINT32 serNum )
 {
   bool matches = pattern && pattern->matches( serNum );