1 files changed, 14 insertions, 14 deletions

diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index c2e60a091..025a9d71d 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -55,7 +55,7 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 
 #ifndef MAX_LINE
 #define MAX_LINE 4096
@@ -682,7 +682,7 @@ int KMFolderMbox::createIndexFromContents()
                     replyToIdStr, replyToAuxIdStr, msgIdStr,
                     KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                     KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
-          mi->setStatus(status, xstatus);
+          mi->seStatus(status, xstatus);
           mi->setDate( dateStr.stripWhiteSpace() );
           mi->setDirty(false);
           mMsgList.append(mi, mExportsSernums );
@@ -805,11 +805,11 @@ int KMFolderMbox::createIndexFromContents()
 
   if (kmkernel->outboxFolder() == folder() && count() > 0)
     KMessageBox::queuedMessageBox(0, KMessageBox::Information,
-                                  i18n("Your outbox contains messages which were "
+                                  i18n("Your outbox tqcontains messages which were "
     "most-likely not created by KMail;\nplease remove them from there if you "
     "do not want KMail to send them."));
 
-  invalidateFolder();
+  tqinvalidateFolder();
   return 0;
 }
 
@@ -852,7 +852,7 @@ static size_t unescapeFrom( char* str, size_t strLen ) {
       *d++ = *s++;  // == '>'
       while ( s < e && *s == '>' )
         *d++ = *s++;
-      if ( qstrncmp( s, "From ", STRDIM("From ") ) == 0 )
+      if ( tqstrncmp( s, "From ", STRDIM("From ") ) == 0 )
         --d;
     }
     *d++ = *s++; // yes, s might be e here, but e is not the end :-)
@@ -887,7 +887,7 @@ TQByteArray KMFolderMbox::escapeFrom( const DwString & str ) {
     case '>':
       break;
     case 'F':
-      if ( onlyAnglesAfterLF && qstrncmp( s+1, "rom ", STRDIM("rom ") ) == 0 )
+      if ( onlyAnglesAfterLF && tqstrncmp( s+1, "rom ", STRDIM("rom ") ) == 0 )
         *d++ = '>';
       // fall through
     default:
@@ -979,7 +979,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
     fileD0.close();  // If data is 0 we just create a zero length file.
 }
 */
-    aMsg->setStatusFields();
+    aMsg->seStatusFields();
 /*
 TQFile fileD1( "testdat_xx-kmfoldermbox-1" );
 if( fileD1.open( IO_WriteOnly ) ) {
@@ -998,7 +998,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   clearerr(mStream);
   if (len <= 0)
   {
-    kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl;
+    kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl;
     return 0;
   }
 
@@ -1085,7 +1085,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   if ( aMsg->getMsgSerNum() <= 0 )
     aMsg->setMsgSerNum();
   else
-    replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
+    tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
 
   // change the length of the previous message to encompass white space added
   if ((idx > 0) && (growth > 0)) {
@@ -1175,7 +1175,7 @@ int KMFolderMbox::compact( unsigned int startIndex, int nbMessages, FILE* tmpfil
         mtext.resize(20);
       fread(mtext.data(), 20, 1, mStream);
       if(i <= 0) { //woops we've reached the top of the file, last try..
-        if ( mtext.contains( "from ", false ) ) {
+        if ( mtext.tqcontains( "from ", false ) ) {
           if (mtext.size() < (size_t)folder_offset)
               mtext.resize(folder_offset);
           if(fseek(mStream, chunk_offset, SEEK_SET) == -1 ||
@@ -1238,9 +1238,9 @@ int KMFolderMbox::compact( bool silent )
 
   // If this is the current folder, the changed signal will ultimately call
   // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
-  TQString statusMsg = BroadcastStatus::instance()->statusMsg();
+  TQString statusMsg = BroadcasStatus::instance()->statusMsg();
   emit changed();
-  BroadcastStatus::instance()->setStatusMsg( statusMsg );
+  BroadcasStatus::instance()->seStatusMsg( statusMsg );
   return rc;
 }
 
@@ -1276,10 +1276,10 @@ int KMFolderMbox::expungeContents()
 
 //-----------------------------------------------------------------------------
 /*virtual*/
-Q_INT64 KMFolderMbox::doFolderSize() const
+TQ_INT64 KMFolderMbox::doFolderSize() const
 {
   TQFileInfo info( location() );
-  return (Q_INT64)(info.size());
+  return (TQ_INT64)(info.size());
 }
 
 //-----------------------------------------------------------------------------