1 files changed, 15 insertions, 15 deletions

diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 47e04f33b..6062f3547 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -8,7 +8,7 @@
 #include "kmfoldermbox.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess()
   if ( precommand().isEmpty() ) {
     TQFileInfo fi( location() );
     if ( fi.size() == 0 ) {
-      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       checkDone( mHasNewMail, CheckOK );
       return false;
     }
@@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess()
 
   if (!mFolder) {
     checkDone( mHasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
-  //BroadcasStatus::instance()->reset();
-  BroadcasStatus::instance()->seStatusMsg(
+  //BroadcastqStatus::instance()->reset();
+  BroadcastqStatus::instance()->seStatusMsg(
         i18n("Preparing transmission from \"%1\"...").arg(mName));
 
 
@@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess()
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
     return false;
   }
 
@@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess()
     kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/"
       << mMailFolder->name() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
@@ -165,7 +165,7 @@ bool KMAcctLocal::preProcess()
     checkDone( mHasNewMail, CheckError );
     TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
       .arg( mMailFolder->location() );
-    BroadcasStatus::instance()->seStatusMsg( errMsg );
+    BroadcastqStatus::instance()->seStatusMsg( errMsg );
     return false;
   }
 
@@ -179,7 +179,7 @@ bool KMAcctLocal::preProcess()
   mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
     .arg(mMailFolder->location()).arg( mNumMsgs );
 
-  //BroadcasStatus::instance()->seStatusProgressEnable( "L" + mName, true );
+  //BroadcastqStatus::instance()->seStatusProgressEnable( "L" + mName, true );
   return true;
 }
 
@@ -193,10 +193,10 @@ bool KMAcctLocal::fetchMsg()
   if (kmkernel->mailCheckAborted()) break; */
 
   const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
-  //BroadcasStatus::instance()->seStatusMsg( statusMsg );
+  //BroadcastqStatus::instance()->seStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
-  mMailCheckProgressItem->seStatus( statusMsg );
+  mMailCheckProgressItem->setqStatus( statusMsg );
 
   msg = mMailFolder->take(0);
   if (msg)
@@ -214,8 +214,8 @@ bool KMAcctLocal::fetchMsg()
       fileD0.close();  // If data is 0 we just create a zero length file.
     }
 #endif
-    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));
     msg->setComplete(true);
@@ -249,8 +249,8 @@ void KMAcctLocal::postProcess()
     }
 
     if( mMailCheckProgressItem ) { // do this only once...
-      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
-      mMailCheckProgressItem->seStatus(
+      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
+      mMailCheckProgressItem->setqStatus(
         i18n( "Fetched 1 message from mailbox %1.",
               "Fetched %n messages from mailbox %1.",
               mNumMsgs ).arg( mMailFolder->location() ) );