[kdepim] revert some accidental renamed classes/methods and strings (fix quote reply)

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1230817 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

20 files changed, 80 insertions, 80 deletions

diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 40d95b296..37c9d77bb 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -155,7 +155,7 @@ void AccountManager::processNextCheck( bool _newMail )
   if ( mAcctChecking.isEmpty() ) {
     // all checks finished, display summary
     if ( mDisplaySummary )
-      KPIM::BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
+      KPIM::BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
           mTotalNewMailsArrived );
     emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder );
     mTotalNewMailsArrived = 0;
@@ -222,7 +222,7 @@ void AccountManager::processNextCheck( bool _newMail )
   connect( curAccount, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                 this, TQT_SLOT( processNextCheck( bool ) ) );
 
-  KPIM::BroadcastqStatus::instance()->seStatusMsg(
+  KPIM::BroadcastStatus::instance()->seStatusMsg(
       i18n("Checking account %1 for new mail").tqarg(curAccount->name()));
 
   kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index 5de762e96..35aa6ef3f 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -28,7 +28,7 @@
 #include "compactionjob.h"
 #include "kmfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "kmfoldermbox.h"
 #include "kmfoldermaildir.h"
 
@@ -97,7 +97,7 @@ int MboxCompactionJob::executeNow( bool silent )
     kdDebug(5006) << storage->location() << " compaction skipped." << endl;
     if ( !mSilent ) {
       TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).tqarg( mbox->label() );
-      BroadcastqStatus::instance()->seStatusMsg( str );
+      BroadcastStatus::instance()->seStatusMsg( str );
     }
     return 0;
   }
@@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc )
   mErrorCode = rc;
 
   if ( !mSilent )
-    BroadcastqStatus::instance()->seStatusMsg( str );
+    BroadcastStatus::instance()->seStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
@@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc )
   if ( storage->isOpened() )
     storage->updateIndex();
   if ( !mSilent )
-    BroadcastqStatus::instance()->seStatusMsg( str );
+    BroadcastStatus::instance()->seStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index 30ab9cd7d..65de61a33 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -31,7 +31,7 @@
 #include "globalsettings.h"
 #include "folderstorage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "kmcommands.h"
 
 #include <kdebug.h>
@@ -190,7 +190,7 @@ void ExpireJob::done()
     }
   }
   if ( !str.isEmpty() )
-    BroadcastqStatus::instance()->seStatusMsg( str );
+    BroadcastStatus::instance()->seStatusMsg( str );
 
   KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
   group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
@@ -244,7 +244,7 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
     }
   default: ;
   }
-  BroadcastqStatus::instance()->seStatusMsg( msg );
+  BroadcastStatus::instance()->seStatusMsg( msg );
 
   deleteLater();
 }
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 84da936e9..4b0c32d53 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -32,7 +32,7 @@ using KMail::SieveConfig;
 using KMail::AccountManager;
 #include "kmfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "kmmainwin.h"
 #include "kmfolderimap.h"
 #include "kmmainwidget.h"
@@ -354,7 +354,7 @@ namespace KMail {
       checkDone( false, CheckOK );
     }
     if ( showStatusMsg )
-      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
+      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
           name(), newMails);
   }
 
@@ -961,10 +961,10 @@ namespace KMail {
           KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" );
           // Show it in the status bar, in case the user has ticked "don't show again"
           if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
-            KPIM::BroadcastqStatus::instance()->seStatusMsg(
+            KPIM::BroadcastStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 was broken." ).tqarg( name() ) );
           else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
-            KPIM::BroadcastqStatus::instance()->seStatusMsg(
+            KPIM::BroadcastStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 timed out." ).tqarg( name() ) );
         } else {
           if ( !errors.isEmpty() )
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index 6c7950ae6..ddc16b233 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -12,7 +12,7 @@ using KMail::AccountManager;
 #include "messagesender.h"
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "kmfoldercachedimap.h"
 
 #include "progressmanager.h"
@@ -45,7 +45,7 @@ using KMail::FolderJob;
 KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent)
   : TQObject(tqparent), mPrecommand(precommand)
 {
-  BroadcastqStatus::instance()->seStatusMsg(
+  BroadcastStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").tqarg(precommand ));
 
   mPrecommandProcess.setUseShell(true);
@@ -377,7 +377,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
 
   KMPrecommand precommandProcess(precommand, this);
 
-  BroadcastqStatus::instance()->seStatusMsg(
+  BroadcastStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").tqarg(precommand ));
 
   connect(&precommandProcess, TQT_SIGNAL(finished(bool)),
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index b16dc0b34..bb09d692d 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -28,7 +28,7 @@ using KMail::SieveConfig;
 
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "kmfoldertree.h"
 #include "kmfoldermgr.h"
 #include "kmfolderimap.h"
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 5c842b1d1..d283a1972 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -8,7 +8,7 @@
 #include "kmfoldermbox.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess()
   if ( precommand().isEmpty() ) {
     TQFileInfo fi( location() );
     if ( fi.size() == 0 ) {
-      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       checkDone( mHasNewMail, CheckOK );
       return false;
     }
@@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess()
 
   if (!mFolder) {
     checkDone( mHasNewMail, CheckError );
-    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
-  //BroadcastqStatus::instance()->reset();
-  BroadcastqStatus::instance()->seStatusMsg(
+  //BroadcastStatus::instance()->reset();
+  BroadcastStatus::instance()->seStatusMsg(
         i18n("Preparing transmission from \"%1\"...").tqarg(mName));
 
 
@@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess()
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcastqStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
+    BroadcastStatus::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 );
-    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::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." )
       .tqarg( mMailFolder->location() );
-    BroadcastqStatus::instance()->seStatusMsg( errMsg );
+    BroadcastStatus::instance()->seStatusMsg( errMsg );
     return false;
   }
 
@@ -179,7 +179,7 @@ bool KMAcctLocal::preProcess()
   mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
     .tqarg(mMailFolder->location()).tqarg( mNumMsgs );
 
-  //BroadcastqStatus::instance()->seStatusProgressEnable( "L" + mName, true );
+  //BroadcastStatus::instance()->seStatusProgressEnable( "L" + mName, true );
   return true;
 }
 
@@ -193,7 +193,7 @@ bool KMAcctLocal::fetchMsg()
   if (kmkernel->mailCheckAborted()) break; */
 
   const TQString statusMsg = mStatusMsgStub.tqarg( mMsgsFetched );
-  //BroadcastqStatus::instance()->seStatusMsg( statusMsg );
+  //BroadcastStatus::instance()->seStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
   mMailCheckProgressItem->setqStatus( statusMsg );
@@ -249,7 +249,7 @@ void KMAcctLocal::postProcess()
     }
 
     if( mMailCheckProgressItem ) { // do this only once...
-      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
+      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
       mMailCheckProgressItem->setqStatus(
         i18n( "Fetched 1 message from mailbox %1.",
               "Fetched %n messages from mailbox %1.",
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index 07391a582..7491f4122 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -9,7 +9,7 @@
 #include "kmfoldermaildir.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool)
     TQFileInfo fi( location() );
     if ( !fi.exists() ) {
       checkDone( hasNewMail, CheckOK );
-      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       return;
     }
   }
@@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool)
 
   if (!mFolder) {
     checkDone( hasNewMail, CheckError );
-    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
-  BroadcastqStatus::instance()->seStatusMsg(
+  BroadcastStatus::instance()->seStatusMsg(
 	i18n("Preparing transmission from \"%1\"...").tqarg(mName));
 
   Q_ASSERT( !mMailCheckProgressItem );
@@ -123,7 +123,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::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 );
-    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
 
     if( kmkernel->mailCheckAborted() ) {
-      BroadcastqStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
+      BroadcastStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
       num = i;
       addedOk = false;
     }
@@ -188,7 +188,7 @@ void KMAcctMaildir::processNewMail(bool)
   }
 
   if( mMailCheckProgressItem ) { // do this only once...
-    BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( num );
+    BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( num );
     mMailCheckProgressItem->setqStatus(
       i18n( "Fetched 1 message from maildir folder %1.",
             "Fetched %n messages from maildir folder %1.",
@@ -199,7 +199,7 @@ void KMAcctMaildir::processNewMail(bool)
   }
   if (addedOk)
   {
-    BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
+    BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
   }
   // else warning is written already
 
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index ba4a84e7a..1fe29b6b3 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute()
     clip->setText( address );
     clip->setSelectionMode( false );
     clip->setText( address );
-    KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
+    KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
   } else {
     // put the url into the mouse selection and the clipboard
     clip->setSelectionMode( true );
     clip->setText( mUrl.url() );
     clip->setSelectionMode( false );
     clip->setText( mUrl.url() );
-    KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
+    KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
   }
 
   return OK;
@@ -1742,7 +1742,7 @@ KMCommand::Result KMFilterActionCommand::execute()
       progressItem->updateProgress();
       TQString statusMsg = i18n("Filtering message %1 of %2");
       statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
-      KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
+      KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg );
       KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
 
@@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
            (mUrl.protocol() == "smb")  || (mUrl.protocol() == "fish")  ||
            (mUrl.protocol() == "news"))
   {
-    KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n("Opening URL..."));
+    KPIM::BroadcastStatus::instance()->seStatusMsg( i18n("Opening URL..."));
     KMimeType::Ptr mime = KMimeType::findByURL( mUrl );
     if (mime->name() == "application/x-desktop" ||
         mime->name() == "application/x-executable" ||
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index 94bd09b20..a774e11e0 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -49,7 +49,7 @@ using KMail::AccountManager;
 #include "kmglobal.h"
 #include "acljobs.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "progressmanager.h"
 
 using KMail::CachedImapJob;
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index b9bbd1a67..504b5c5ae 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -55,7 +55,7 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 
 #ifndef MAX_LINE
 #define MAX_LINE 4096
@@ -1238,9 +1238,9 @@ int KMFolderMbox::compact( bool silent )
 
   // If this is the current folder, the changed signal will ultimately call
   // KMHeaders::setFolderInfotqStatus which will override the message, so save/restore it
-  TQString statusMsg = BroadcastqStatus::instance()->statusMsg();
+  TQString statusMsg = BroadcastStatus::instance()->statusMsg();
   emit changed();
-  BroadcastqStatus::instance()->seStatusMsg( statusMsg );
+  BroadcastStatus::instance()->seStatusMsg( statusMsg );
   return rc;
 }
 
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 987da0c60..f13425eb0 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -22,7 +22,7 @@ using KMail::ActionScheduler;
 #include "messagecopyhelper.h"
 using KMail::MessageCopyHelper;
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 using KPIM::ProgressItem;
@@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       disconnect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ),
-                  BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+                  BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
       writeSortOrder();
       mFolder->close("kmheaders");
@@ -752,7 +752,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       connect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
-              BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+              BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
           this, TQT_SLOT(setFolderInfotqStatus()));
       connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
@@ -1403,7 +1403,7 @@ void KMHeaders::setFolderInfotqStatus ()
               : i18n( "0 messages" ); // no need for "0 unread" to be added here
   if ( mFolder->isReadOnly() )
     str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").tqarg( str );
-  BroadcastqStatus::instance()->seStatusMsg(str);
+  BroadcastStatus::instance()->seStatusMsg(str);
 }
 
 //-----------------------------------------------------------------------------
@@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg()
         progressItem->updateProgress();
         TQString statusMsg = i18n("Filtering message %1 of %2");
         statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
-        KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
+        KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg );
         KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
@@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg ()
            this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
   command->start();
 
-  BroadcastqStatus::instance()->seStatusMsg("");
+  BroadcastStatus::instance()->seStatusMsg("");
   //  triggerUpdate();
 }
 
@@ -1620,7 +1620,7 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
   if ( command->result() == KMCommand::OK ) {
     // make sure the current item is shown
     makeHeaderVisible();
-    BroadcastqStatus::instance()->seStatusMsg(
+    BroadcastStatus::instance()->seStatusMsg(
        deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") );
   } else {
     /* The move failed or the user canceled it; reset the state of all
@@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
     }
     triggerUpdate();
     if ( command->result() == KMCommand::Failed )
-      BroadcastqStatus::instance()->seStatusMsg(
+      BroadcastStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") );
     else
-      BroadcastqStatus::instance()->seStatusMsg(
+      BroadcastStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") );
  }
  mOwner->updateMessageActions();
@@ -2135,7 +2135,7 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread)
     return;
   }
 
-  BroadcastqStatus::instance()->seStatusMsg("");
+  BroadcastStatus::instance()->seStatusMsg("");
   if (markitread && idx >= 0) setMsgRead(idx);
   mItems[idx]->irefresh();
   mItems[idx]->tqrepaint();
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 1d302c261..9754f95a3 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -11,7 +11,7 @@
 
 #include "globalsettings.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "kmstartup.h"
 #include "index.h"
 #include "kmmainwin.h"
@@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline );
-  BroadcastqStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
+  BroadcastStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 }
 
@@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online );
-  BroadcastqStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
+  BroadcastStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 
   if ( kmkernel->msgSender()->sendImmediate() ) {
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index ba8002c75..89c50fd32 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -46,7 +46,7 @@
 #include "globalsettings.h"
 #include "kcursorsaver.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "kmfoldermgr.h"
 #include "kmfolderdia.h"
 #include "accountmanager.h"
@@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder()
   if (mMsgView) mMsgView->clearCache();
 
   if ( !isTrash )
-    BroadcastqStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
+    BroadcastStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
 
   updateMessageActions();
 
@@ -1268,9 +1268,9 @@ void KMMainWidget::slotCompactFolder()
     KCursorSaver busy(KBusyPtr::busy());
     mFolder->compact( KMFolder::CompactNow );
     // setCurrentItemByIndex will override the statusbar message, so save/restore it
-    TQString statusMsg = BroadcastqStatus::instance()->statusMsg();
+    TQString statusMsg = BroadcastStatus::instance()->statusMsg();
     mHeaders->setCurrentItemByIndex(idx);
-    BroadcastqStatus::instance()->seStatusMsg( statusMsg );
+    BroadcastStatus::instance()->seStatusMsg( statusMsg );
   }
 }
 
@@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates()
                "Removed %n duplicate messages.", numDuplicates );
     else
       msg = i18n("No duplicate messages found.");
-  BroadcastqStatus::instance()->seStatusMsg( msg );
+  BroadcastStatus::instance()->seStatusMsg( msg );
 }
 
 
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index fb2b28b27..c2cb135ec 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -66,7 +66,7 @@ KMMainWin::KMMainWin(TQWidget *)
 
   applyMainWindowSettings(KMKernel::config(), "Main Window");
 
-  connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( displayStatusMsg(const TQString&) ) );
 
   connect(kmkernel, TQT_SIGNAL(configChanged()),
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 1d2edb509..3c2e16ee0 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1892,7 +1892,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   }
 
   if ( aUrl.stripWhiteSpace().isEmpty() ) {
-    KPIM::BroadcastqStatus::instance()->reset();
+    KPIM::BroadcastStatus::instance()->reset();
     mHoveredUrl = KURL();
     mLastClickImagePath = TQString();
     return;
@@ -1903,7 +1903,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   const TQString msg = URLHandlerManager::instance()->statusBarMessage( url, this );
 
   kdWarning( msg.isEmpty(), 5006 ) << "KMReaderWin::slotUrlOn(): Unhandled URL hover!" << endl;
-  KPIM::BroadcastqStatus::instance()->setTransienStatusMsg( msg );
+  KPIM::BroadcastStatus::instance()->setTransienStatusMsg( msg );
 }
 
 
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 99befb43b..932b503e2 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -27,7 +27,7 @@
 #include "popaccount.h"
 
 #include "broadcaststatus.h"
-using KPIM::BroadcastqStatus;
+using KPIM::BroadcastStatus;
 #include "progressmanager.h"
 #include "kmfoldermgr.h"
 #include "kmfiltermgr.h"
@@ -798,7 +798,7 @@ void PopAccount::slotJobFinished() {
     if( mMailCheckProgressItem ) { // do this only once...
       bool canceled = !kmkernel || kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled();
       int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count();
-      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
+      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
         this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
       // set mMailCheckProgressItem = 0 before calling setComplete() to prevent
       // a race condition
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 8e167f5fd..775d9a938 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -297,11 +297,11 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
                               tqarg( path ).tqarg(file.errorString() ));
         }
 
-      } else if ( cmd.startsWith( "TQUOTEPIPE=" ) ) {
+      } else if ( cmd.startsWith( "QUOTEPIPE=" ) ) {
         // pipe message body throw command and insert it as quotation
         kdDebug() << "Command: TQUOTEPIPE=" << endl;
         TQString q;
-        int len = parseQuotes( "TQUOTEPIPE=", cmd, q );
+        int len = parseQuotes( "QUOTEPIPE=", cmd, q );
         i += len;
         TQString pipe_cmd = q;
         if ( mOrigMsg ) {
@@ -311,9 +311,9 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
           body.append( quote );
         }
 
-      } else if ( cmd.startsWith( "TQUOTE" ) ) {
+      } else if ( cmd.startsWith( "QUOTE" ) ) {
         kdDebug() << "Command: TQUOTE" << endl;
-        i += strlen( "TQUOTE" );
+        i += strlen( "QUOTE" );
         if ( mOrigMsg ) {
           TQString quote = mOrigMsg->asQuotedString( "", mQuoteString, messageText( true ),
                                                     shouldStripSignature(), mAllowDecryption );
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 00bf87d90..09614064d 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -323,7 +323,7 @@ void TemplatesConfiguration::loadFromPhrases()
 
   str = replyPhrases.phraseReplySender();
   if ( !str.isEmpty() ) {
-    textEdit_reply->setText( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
+    textEdit_reply->setText( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
   }
   else {
     textEdit_reply->setText( defaultReply() );
@@ -331,7 +331,7 @@ void TemplatesConfiguration::loadFromPhrases()
 
   str = replyPhrases.phraseReplyAll();
   if ( !str.isEmpty() ) {
-    textEdit_reply_all->setText( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
+    textEdit_reply_all->setText( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
   }
   else {
     textEdit_reply_all->setText( defaultReplyAll() );
@@ -372,7 +372,7 @@ void TemplatesConfiguration::importFromPhrases()
 
   str = replyPhrases.phraseReplySender();
   if ( !str.isEmpty() ) {
-    GlobalSettings::self()->setTemplateReply( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
+    GlobalSettings::self()->setTemplateReply( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
   }
   else {
     GlobalSettings::self()->setTemplateReply( defaultReply() );
@@ -380,7 +380,7 @@ void TemplatesConfiguration::importFromPhrases()
 
   str = replyPhrases.phraseReplyAll();
   if ( !str.isEmpty() ) {
-    GlobalSettings::self()->setTemplateReplyAll( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
+    GlobalSettings::self()->setTemplateReplyAll( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
   }
   else {
     GlobalSettings::self()->setTemplateReplyAll( defaultReplyAll() );
@@ -521,7 +521,7 @@ TQString TemplatesConfiguration::defaultReply() {
     "%BLANK\n"
     "%REM=\"Default reply template\"%-\n"
     "On %ODATEEN %OTIMELONGEN you wrote:\n"
-    "%TQUOTE\n"
+    "%QUOTE\n"
     );
 }
 
@@ -531,7 +531,7 @@ TQString TemplatesConfiguration::defaultReplyAll() {
     "%BLANK\n"
     "%REM=\"Default reply all template\"%-\n"
     "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
-    "%TQUOTE\n"
+    "%QUOTE\n"
     );
 }
 
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 90a143731..269c40c04 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -334,7 +334,7 @@ void TemplatesInsertCommand::slotMapped( int cmd )
   emit insertCommand( static_cast<Command>( cmd ) );
 
   switch( cmd ) {
-  case TemplatesInsertCommand::CQuote: emit insertCommand("%TQUOTE"); break;
+  case TemplatesInsertCommand::CQuote: emit insertCommand("%QUOTE"); break;
   case TemplatesInsertCommand::CText: emit insertCommand("%TEXT"); break;
   case TemplatesInsertCommand::COMsgId: emit insertCommand("%OMSGID"); break;
   case TemplatesInsertCommand::CODate: emit insertCommand("%ODATE"); break;
@@ -384,7 +384,7 @@ void TemplatesInsertCommand::slotMapped( int cmd )
   case TemplatesInsertCommand::CFullSubject: emit insertCommand("%FULLSUBJECT"); break;
   case TemplatesInsertCommand::CHeader: emit insertCommand("%HEADER=\"\"", -1); break;
   case TemplatesInsertCommand::CSystem: emit insertCommand("%SYSTEM=\"\"", -1); break;
-  case TemplatesInsertCommand::CQuotePipe: emit insertCommand("%TQUOTEPIPE=\"\"", -1); break;
+  case TemplatesInsertCommand::CQuotePipe: emit insertCommand("%QUOTEPIPE=\"\"", -1); break;
   case TemplatesInsertCommand::CTextPipe: emit insertCommand("%TEXTPIPE=\"\"", -1); break;
   case TemplatesInsertCommand::CMsgPipe: emit insertCommand("%MSGPIPE=\"\"", -1); break;
   case TemplatesInsertCommand::CBodyPipe: emit insertCommand("%BODYPIPE=\"\"", -1); break;