1 files changed, 13 insertions, 13 deletions

diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index ca3789207..7b83dcf89 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -9,7 +9,7 @@
 #include "kmfoldermaildir.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool)
     TQFileInfo fi( location() );
     if ( !fi.exists() ) {
       checkDone( hasNewMail, CheckOK );
-      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       return;
     }
   }
@@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool)
 
   if (!mFolder) {
     checkDone( hasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
-  BroadcasStatus::instance()->seStatusMsg(
+  BroadcastqStatus::instance()->seStatusMsg(
 	i18n("Preparing transmission from \"%1\"...").arg(mName));
 
   Q_ASSERT( !mMailCheckProgressItem );
@@ -123,7 +123,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -134,7 +134,7 @@ void KMAcctMaildir::processNewMail(bool)
     KMessageBox::sorry(0, aStr);
     kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
 
     if( kmkernel->mailCheckAborted() ) {
-      BroadcasStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
+      BroadcastqStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
       num = i;
       addedOk = false;
     }
@@ -165,13 +165,13 @@ void KMAcctMaildir::processNewMail(bool)
     TQString statusMsg = statusMsgStub.arg(i);
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->seStatus( statusMsg );
+    mMailCheckProgressItem->setqStatus( statusMsg );
 
     msg = mailFolder.take(0);
     if (msg)
     {
-      msg->seStatus(msg->headerField("Status").latin1(),
-        msg->headerField("X-Status").latin1());
+      msg->setqStatus(msg->headerField("tqStatus").latin1(),
+        msg->headerField("X-tqStatus").latin1());
       msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0));
       msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
 
@@ -188,8 +188,8 @@ void KMAcctMaildir::processNewMail(bool)
   }
 
   if( mMailCheckProgressItem ) { // do this only once...
-    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( num );
-    mMailCheckProgressItem->seStatus(
+    BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( num );
+    mMailCheckProgressItem->setqStatus(
       i18n( "Fetched 1 message from maildir folder %1.",
             "Fetched %n messages from maildir folder %1.",
             num ).arg(mailFolder.location() ) );
@@ -199,7 +199,7 @@ void KMAcctMaildir::processNewMail(bool)
   }
   if (addedOk)
   {
-    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
+    BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
   }
   // else warning is written already