1 files changed, 21 insertions, 21 deletions

diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 761f4d60a..eda44482a 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -80,7 +80,7 @@ KMSender::~KMSender()
 void KMSender::seStatusMsg(const TQString &msg)
 {
   if ( mProgressItem )
-    mProgressItem->setqStatus(msg);
+    mProgressItem->seStatus(msg);
 }
 
 //-----------------------------------------------------------------------------
@@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
   KMFolder * const outbox = kmkernel->outboxFolder();
   const KMFolderOpener openOutbox( outbox, "outbox" );
 
-  aMsg->setqStatus(KMMsgStatusQueued);
+  aMsg->seStatus(KMMsgStatusQueued);
 
   if ( const int err = outbox->addMsg(aMsg) ) {
     Q_UNUSED( err );
@@ -314,8 +314,8 @@ void KMSender::doSendMsg()
         mCurrentMsg->addBodyPart( &msgPart );
       }
     }
-    mCurrentMsg->setqStatus(KMMsgStatusSent);
-    mCurrentMsg->setqStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
+    mCurrentMsg->seStatus(KMMsgStatusSent);
+    mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
     mCurrentMsg->updateAttachmentState();
     mCurrentMsg->updateInvitationState();
 
@@ -387,7 +387,7 @@ void KMSender::doSendMsg()
           "\"outbox\" to the \"sent-mail\" folder failed.\n"
           "Possible reasons are lack of disk space or write permission. "
           "Please try to fix the problem and move the message manually.")
-          .tqarg(mCurrentMsg->subject()));
+          .arg(mCurrentMsg->subject()));
         cleanup();
         return;
       }
@@ -435,7 +435,7 @@ void KMSender::doSendMsg()
                                    "identity '%1' in the Identities "
                                    "section of the configuration dialog "
                                    "and then try again." )
-                             .tqarg( id.identityName() ) );
+                             .arg( id.identityName() ) );
       mOutboxFolder->unGetMsg( mFailedMessages );
       mCurrentMsg = 0;
     }
@@ -455,7 +455,7 @@ void KMSender::doSendMsg()
                           mSentMessages));
       } else {
         seStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
-            .tqarg(mSentMessages).tqarg( mTotalMessages ));
+            .arg(mSentMessages).arg( mTotalMessages ));
       }
     }
     cleanup();
@@ -536,7 +536,7 @@ void KMSender::doSendMsg()
 }
 
 bool KMSender::runPrecommand( const TQString & cmd ) {
-  seStatusMsg( i18n("Executing precommand %1").tqarg( cmd ) );
+  seStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
   mPrecommand = new KMPrecommand( cmd );
   connect( mPrecommand, TQT_SIGNAL(finished(bool)),
            TQT_SLOT(slotPrecommandFinished(bool)) );
@@ -596,8 +596,8 @@ void KMSender::doSendMsgAux()
   // start sending the current message
 
   seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
-	       .tqarg(mSentMessages+mFailedMessages+1).tqarg(mTotalMessages)
-	       .tqarg(mCurrentMsg->subject()));
+	       .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages)
+	       .arg(mCurrentMsg->subject()));
   TQStringList to, cc, bcc;
   TQString sender;
   extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc );
@@ -696,8 +696,8 @@ void KMSender::slotIdle()
         "fix the problem (e.g. a broken address) or remove the message "
         "from the 'outbox' folder.\n"
         "The following transport protocol was used:\n  %2")
-      .tqarg(errString)
-      .tqarg(mMethodStr);
+      .arg(errString)
+      .arg(mMethodStr);
     if (!errString.isEmpty()) KMessageBox::error(0,msg);
     seStatusMsg( i18n( "Sending aborted." ) );
   } else {
@@ -724,8 +724,8 @@ void KMSender::slotIdle()
             "from the 'outbox' folder.</p>"
             "<p>The following transport protocol was used:  %2</p>"
             "<p>Do you want me to continue sending the remaining messages?</p>")
-            .tqarg(errString)
-            .tqarg(mMethodStr);
+            .arg(errString)
+            .arg(mMethodStr);
           res = KMessageBox::warningYesNo( 0 , msg ,
                   i18n( "Continue Sending" ), i18n( "&Continue Sending" ),
                   i18n("&Abort Sending") );
@@ -735,8 +735,8 @@ void KMSender::slotIdle()
             "fix the problem (e.g. a broken address) or remove the message "
             "from the 'outbox' folder.\n"
             "The following transport protocol was used:\n %2")
-            .tqarg(errString)
-            .tqarg(mMethodStr);
+            .arg(errString)
+            .arg(mMethodStr);
           KMessageBox::error(0,msg);
         }
         if (res == KMessageBox::Yes) {
@@ -850,7 +850,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg)
   int n = 0;
   while (1) {
     ulong msn;
-    KMMsgtqStatus status;
+    KMMsgStatus status;
     aMsg->getLink(n, &msn, &status);
     if (!msn || !status)
       break;
@@ -867,7 +867,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg)
           new KMDeleteMsgCommand( folder, folder->getMsg( index ) );
         cmd->start();
       } else {
-        folder->setqStatus(index, status);
+        folder->seStatus(index, status);
       }
     } else {
       kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl;
@@ -934,8 +934,8 @@ bool KMSendSendmail::doStart() {
                              "Please remove it from there if you do not want the message to "
                              "be resent.\n"
                              "The following transport protocol was used:\n  %2")
-                        .tqarg(str + "\n")
-                        .tqarg("sendmail://");
+                        .arg(str + "\n")
+                        .arg("sendmail://");
     KMessageBox::information(0,msg);
     return false;
   }
@@ -978,7 +978,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c
 
   if ( !mMailerProc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
     KMessageBox::information( 0, i18n("Failed to execute mailer program %1")
-                              .tqarg( mSender->transportInfo()->host ) );
+                              .arg( mSender->transportInfo()->host ) );
     return false;
   }
   mMsgPos  = mMsgStr.data();