1 files changed, 12 insertions, 12 deletions

diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 88424e13e..67cc7d4b4 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -21,7 +21,7 @@ using KPIM::ProgressManager;
 #include <kconfig.h>
 
 #include <tqfileinfo.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -125,7 +125,7 @@ bool KMAcctLocal::preProcess()
 
   //BroadcastStatus::instance()->reset();
   BroadcastStatus::instance()->seStatusMsg(
-        i18n("Preparing transmission from \"%1\"...").tqarg(mName));
+        i18n("Preparing transmission from \"%1\"...").arg(mName));
 
 
   Q_ASSERT( !mMailCheckProgressItem );
@@ -133,7 +133,7 @@ bool KMAcctLocal::preProcess()
   mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
     "MailCheck" + mName,
     escapedName,
-    i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ),
+    i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
     false, // cannot be canceled
     false ); // no tls/ssl
 
@@ -164,7 +164,7 @@ bool KMAcctLocal::preProcess()
     mMailFolder->close("acctlocalMail");
     checkDone( mHasNewMail, CheckError );
     TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
-      .tqarg( mMailFolder->location() );
+      .arg( mMailFolder->location() );
     BroadcastStatus::instance()->seStatusMsg( errMsg );
     return false;
   }
@@ -177,7 +177,7 @@ bool KMAcctLocal::preProcess()
 
   // prepare the static parts of the status message:
   mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
-    .tqarg(mMailFolder->location()).tqarg( mNumMsgs );
+    .arg(mMailFolder->location()).arg( mNumMsgs );
 
   //BroadcastStatus::instance()->seStatusProgressEnable( "L" + mName, true );
   return true;
@@ -192,11 +192,11 @@ bool KMAcctLocal::fetchMsg()
   /* This causes mail eating
   if (kmkernel->mailCheckAborted()) break; */
 
-  const TQString statusMsg = mStatusMsgStub.tqarg( mMsgsFetched );
+  const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
   //BroadcastStatus::instance()->seStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
-  mMailCheckProgressItem->setqStatus( statusMsg );
+  mMailCheckProgressItem->seStatus( statusMsg );
 
   msg = mMailFolder->take(0);
   if (msg)
@@ -214,7 +214,7 @@ bool KMAcctLocal::fetchMsg()
       fileD0.close();  // If data is 0 we just create a zero length file.
     }
 #endif
-    msg->setqStatus(msg->headerField("Status").latin1(),
+    msg->seStatus(msg->headerField("Status").latin1(),
       msg->headerField("X-Status").latin1());
     msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) );
     msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
@@ -244,16 +244,16 @@ void KMAcctLocal::postProcess()
       KMessageBox::queuedMessageBox( 0, KMessageBox::Information,
                                      i18n( "<qt>Cannot remove mail from "
                                            "mailbox <b>%1</b>:<br>%2</qt>" )
-                                     .tqarg( mMailFolder->location() )
-                                     .tqarg( strerror( rc ) ) );
+                                     .arg( mMailFolder->location() )
+                                     .arg( strerror( rc ) ) );
     }
 
     if( mMailCheckProgressItem ) { // do this only once...
       BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
-      mMailCheckProgressItem->setqStatus(
+      mMailCheckProgressItem->seStatus(
         i18n( "Fetched 1 message from mailbox %1.",
               "Fetched %n messages from mailbox %1.",
-              mNumMsgs ).tqarg( mMailFolder->location() ) );
+              mNumMsgs ).arg( mMailFolder->location() ) );
       mMailCheckProgressItem->setComplete();
       mMailCheckProgressItem = 0;
     }