diff options
Diffstat (limited to 'kmail/kmacctmaildir.cpp')
-rw-r--r-- | kmail/kmacctmaildir.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index bcf29f118..b3c5d31c7 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool) TQFileInfo fi( location() ); if ( !fi.exists() ) { checkDone( hasNewMail, CheckOK ); - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 ); + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 ); return; } } @@ -102,19 +102,19 @@ void KMAcctMaildir::processNewMail(bool) if (!mFolder) { checkDone( hasNewMail, CheckError ); - BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); return; } - BroadcastStatus::instance()->seStatusMsg( - i18n("Preparing transmission from \"%1\"...").tqarg(mName)); + BroadcastStatus::instance()->setStatusMsg( + i18n("Preparing transmission from \"%1\"...").arg(mName)); Q_ASSERT( !mMailCheckProgressItem ); TQString escapedName = TQStyleSheet::escape( mName ); 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 @@ -123,18 +123,18 @@ void KMAcctMaildir::processNewMail(bool) { kdDebug(5006) << "cannot run precommand " << precommand() << endl; checkDone( hasNewMail, CheckError ); - BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); return; } rc = mailFolder.open("acctmaildirMail"); if (rc) { - TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").tqarg( mailFolder.location() ); + TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").arg( mailFolder.location() ); KMessageBox::sorry(0, aStr); kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl; checkDone( hasNewMail, CheckError ); - BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); return; } @@ -148,7 +148,7 @@ void KMAcctMaildir::processNewMail(bool) // prepare the static parts of the status message: TQString statusMsgStub = i18n("Moving message %3 of %2 from %1.") - .tqarg(mailFolder.location()).tqarg(num); + .arg(mailFolder.location()).arg(num); mMailCheckProgressItem->setTotalItems( num ); @@ -156,21 +156,21 @@ void KMAcctMaildir::processNewMail(bool) { if( kmkernel->mailCheckAborted() ) { - BroadcastStatus::instance()->seStatusMsg( i18n("Transmission aborted.") ); + BroadcastStatus::instance()->setStatusMsg( i18n("Transmission aborted.") ); num = i; addedOk = false; } if (!addedOk) break; - TQString statusMsg = statusMsgStub.tqarg(i); + TQString statusMsg = statusMsgStub.arg(i); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( statusMsg ); + mMailCheckProgressItem->setStatus( statusMsg ); msg = mailFolder.take(0); if (msg) { - msg->seStatus(msg->headerField("Status").latin1(), + msg->setStatus(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)); @@ -188,18 +188,18 @@ void KMAcctMaildir::processNewMail(bool) } if( mMailCheckProgressItem ) { // do this only once... - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( num ); - mMailCheckProgressItem->seStatus( + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( num ); + mMailCheckProgressItem->setStatus( i18n( "Fetched 1 message from maildir folder %1.", "Fetched %n messages from maildir folder %1.", - num ).tqarg(mailFolder.location() ) ); + num ).arg(mailFolder.location() ) ); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; } if (addedOk) { - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, num ); + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, num ); } // else warning is written already |