1 files changed, 21 insertions, 21 deletions

diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 19661be97..508964519 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -537,7 +537,7 @@ KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent
 
 KMCommand::Result KMAddBookmarksCommand::execute()
 {
-  TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
+  TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
   KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,
                                                                     false );
   KBookmarkGroup group = bookManager->root();
@@ -1395,7 +1395,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
       id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt();
     // set the part header
     msgPartText += "--";
-    msgPartText += TQString::tqfromLatin1( boundary );
+    msgPartText += TQString::fromLatin1( boundary );
     msgPartText += "\nContent-Type: MESSAGE/RFC822";
     msgPartText += TQString( "; CHARSET=%1" ).tqarg( TQString(msg->charset()) );
     msgPartText += '\n';
@@ -1422,7 +1422,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
     id = mIdentity; // use folder identity if no message had an id set
   fwdMsg->initHeader( id );
   msgPartText += "--";
-  msgPartText += TQString::tqfromLatin1( boundary );
+  msgPartText += TQString::fromLatin1( boundary );
   msgPartText += "--\n";
   TQCString tmp;
   msgPart->setTypeStr( "MULTIPART" );
@@ -1639,9 +1639,9 @@ KMCommand::Result KMPrintCommand::execute()
 }
 
 
-KMSeStatusCommand::KMSeStatusCommand( KMMsgtqStatus status,
+KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status,
   const TQValueList<TQ_UINT32> &serNums, bool toggle )
-  : mtqStatus( status ), mSerNums( serNums ), mToggle( toggle )
+  : mStatus( status ), mSerNums( serNums ), mToggle( toggle )
 {
 }
 
@@ -1650,7 +1650,7 @@ KMCommand::Result KMSeStatusCommand::execute()
   TQValueListIterator<TQ_UINT32> it;
   int idx = -1;
   KMFolder *folder = 0;
-  bool parentqStatus = false;
+  bool parenStatus = false;
 
   // Toggle actions on threads toggle the whole thread
   // depending on the state of the parent.
@@ -1659,10 +1659,10 @@ KMCommand::Result KMSeStatusCommand::execute()
     KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx );
     if (folder) {
       msg = folder->getMsgBase(idx);
-      if (msg && (msg->status()&mtqStatus))
-        parentqStatus = true;
+      if (msg && (msg->status()&mStatus))
+        parenStatus = true;
       else
-        parentqStatus = false;
+        parenStatus = false;
     }
   }
   TQMap< KMFolder*, TQValueList<int> > folderMap;
@@ -1673,12 +1673,12 @@ KMCommand::Result KMSeStatusCommand::execute()
         KMMsgBase *msg = folder->getMsgBase(idx);
         // check if we are already at the target toggle state
         if (msg) {
-          bool mytqStatus;
-          if (msg->status()&mtqStatus)
-            mytqStatus = true;
+          bool myStatus;
+          if (msg->status()&mStatus)
+            myStatus = true;
           else
-            mytqStatus = false;
-          if (mytqStatus != parentqStatus)
+            myStatus = false;
+          if (myStatus != parenStatus)
             continue;
         }
       }
@@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute()
   TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin();
   while ( it2 != folderMap.end() ) {
      KMFolder *f = it2.key();
-     f->setqStatus( (*it2), mtqStatus, mToggle );
+     f->seStatus( (*it2), mStatus, mToggle );
      ++it2;
   }
   //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
@@ -2015,7 +2015,7 @@ KMCommand::Result KMCopyCommand::execute()
       // make sure the attachment state is only calculated when it's complete
       if (!newMsg->isComplete())
         newMsg->setReadyToShow(false);
-      newMsg->setqStatus(msg->status());
+      newMsg->seStatus(msg->status());
 
       if (srcFolder && !newMsg->isComplete())
       {
@@ -3011,7 +3011,7 @@ KMCommand::Result KMIMChatCommand::execute()
       {
           nameList.append( (*it).realName() );
       }
-      TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) );
+      TQString names = nameList.join( TQString::fromLatin1( ",\n" ) );
       apology = apology.tqarg( names );
     }
 
@@ -3216,7 +3216,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
     return;
 
   // FIXME: better detection of mimetype??
-  if ( !mAtmName.tqendsWith( ".xia", false ) )
+  if ( !mAtmName.endsWith( ".xia", false ) )
     return;
 
   const Kleo::CryptoBackend::Protocol * chiasmus =
@@ -3297,7 +3297,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
 }
 
 static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) {
-  return base.tqendsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ;
+  return base.endsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ;
 }
 
 void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::Error & err, const TQVariant & result )
@@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->setqStatus( msg->status() );
+  newMsg->seStatus( msg->status() );
 
   storeChangedMessage( newMsg );
   return OK;
@@ -3543,7 +3543,7 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher)
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->setqStatus( msg->status() );
+  newMsg->seStatus( msg->status() );
 
   storeChangedMessage( newMsg );
 }