diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kmail/kmsender.cpp | |
parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmsender.cpp')
-rw-r--r-- | kmail/kmsender.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 7f7730daf..208bf5746 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -77,10 +77,10 @@ KMSender::~KMSender() } //----------------------------------------------------------------------------- -void KMSender::setStatusMsg(const TQString &msg) +void KMSender::seStatusMsg(const TQString &msg) { if ( mProgressItem ) - mProgressItem->setStatus(msg); + mProgressItem->seStatus(msg); } //----------------------------------------------------------------------------- @@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow) KMFolder * const outbox = kmkernel->outboxFolder(); const KMFolderOpener openOutbox( outbox, "outbox" ); - aMsg->setStatus(KMMsgStatusQueued); + aMsg->seStatus(KMMsgStatusQueued); if ( const int err = outbox->addMsg(aMsg) ) { Q_UNUSED( err ); @@ -178,7 +178,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow) * the mail is in a sane state before sending. The unGet makes the * attached unencrypted version of the mail (if there is one ) disappear. * though, so we need to make sure to keep it around and restore it - * afterwards. The real fix would be to replace the unGet with + * afterwards. The real fix would be to tqreplace the unGet with * whatever parsing is triggered by it, but I'm too chicken to do that, * in this branch. * Note that the unencrypted mail will be lost if the mail remains in @@ -293,7 +293,7 @@ void KMSender::doSendMsg() { mCurrentMsg->setTransferInProgress( false ); if( mCurrentMsg->hasUnencryptedMsg() ) { - kdDebug(5006) << "KMSender::doSendMsg() post-processing: replace mCurrentMsg body by unencryptedMsg data" << endl; + kdDebug(5006) << "KMSender::doSendMsg() post-processing: tqreplace mCurrentMsg body by unencryptedMsg data" << endl; // delete all current body parts mCurrentMsg->deleteBodyParts(); // copy Content-[..] headers from unencrypted message to current one @@ -314,8 +314,8 @@ void KMSender::doSendMsg() mCurrentMsg->addBodyPart( &msgPart ); } } - mCurrentMsg->setStatus(KMMsgStatusSent); - mCurrentMsg->setStatus(KMMsgStatusRead); // otherwise it defaults to new on imap + mCurrentMsg->seStatus(KMMsgStatusSent); + mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap mCurrentMsg->updateAttachmentState(); mCurrentMsg->updateInvitationState(); @@ -400,7 +400,7 @@ void KMSender::doSendMsg() default: break; } - setStatusByLink( mCurrentMsg ); + seStatusByLink( mCurrentMsg ); if (mCurrentMsg->parent() && !imapSentFolder) { // for speed optimization, this code assumes that mCurrentMsg is the // last one in it's parent folder; make sure that's really the case: @@ -450,11 +450,11 @@ void KMSender::doSendMsg() sentFolder->close("sentFolder"); if ( someSent ) { if ( mSentMessages == mTotalMessages ) { - setStatusMsg(i18n("%n queued message successfully sent.", + seStatusMsg(i18n("%n queued message successfully sent.", "%n queued messages successfully sent.", mSentMessages)); } else { - setStatusMsg(i18n("%1 of %2 queued messages successfully sent.") + seStatusMsg(i18n("%1 of %2 queued messages successfully sent.") .arg(mSentMessages).arg( mTotalMessages )); } } @@ -536,7 +536,7 @@ void KMSender::doSendMsg() } bool KMSender::runPrecommand( const TQString & cmd ) { - setStatusMsg( i18n("Executing precommand %1").arg( cmd ) ); + seStatusMsg( i18n("Executing precommand %1").arg( cmd ) ); mPrecommand = new KMPrecommand( cmd ); connect( mPrecommand, TQT_SIGNAL(finished(bool)), TQT_SLOT(slotPrecommandFinished(bool)) ); @@ -554,7 +554,7 @@ void KMSender::sendProcStarted(bool success) if (mSendProc) mSendProc->finish(); else - setStatusMsg(i18n("Unrecognized transport protocol. Unable to send message.")); + seStatusMsg(i18n("Unrecognized transport protocol. Unable to send message.")); mSendProc = 0; mSendProcStarted = false; cleanup(); @@ -595,7 +595,7 @@ void KMSender::doSendMsgAux() // start sending the current message - setStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3") + seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3") .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages) .arg(mCurrentMsg->subject())); TQStringList to, cc, bcc; @@ -614,7 +614,7 @@ void KMSender::doSendMsgAux() mOutboxFolder->unGetMsg( mFailedMessages ); mCurrentMsg = 0; cleanup(); - setStatusMsg(i18n("Failed to send (some) queued messages.")); + seStatusMsg(i18n("Failed to send (some) queued messages.")); return; } // Do *not* add code here, after send(). It can happen that this method @@ -699,7 +699,7 @@ void KMSender::slotIdle() .arg(errString) .arg(mMethodStr); if (!errString.isEmpty()) KMessageBox::error(0,msg); - setStatusMsg( i18n( "Sending aborted." ) ); + seStatusMsg( i18n( "Sending aborted." ) ); } else { if (!mSendProc->sendOk()) { if ( mCurrentMsg ) @@ -744,7 +744,7 @@ void KMSender::slotIdle() doSendMsg(); return; } else { - setStatusMsg( i18n( "Sending aborted." ) ); + seStatusMsg( i18n( "Sending aborted." ) ); } } } else { @@ -845,7 +845,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport ) } //----------------------------------------------------------------------------- -void KMSender::setStatusByLink(const KMMessage *aMsg) +void KMSender::seStatusByLink(const KMMessage *aMsg) { int n = 0; while (1) { @@ -867,7 +867,7 @@ void KMSender::setStatusByLink(const KMMessage *aMsg) new KMDeleteMsgCommand( folder, folder->getMsg( index ) ); cmd->start(); } else { - folder->setStatus(index, status); + folder->seStatus(index, status); } } else { kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl; @@ -905,7 +905,7 @@ void KMSendProc::failed(const TQString &aMsg) //----------------------------------------------------------------------------- void KMSendProc::statusMsg(const TQString& aMsg) { - if (mSender) mSender->setStatusMsg(aMsg); + if (mSender) mSender->seStatusMsg(aMsg); } //============================================================================= @@ -1019,7 +1019,7 @@ void KMSendSendmail::receivedStderr(KProcess *proc, char *buffer, int buflen) { assert(proc!=0); Q_UNUSED( proc ); - mLastErrorMessage.replace(mLastErrorMessage.length(), buflen, buffer); + mLastErrorMessage.tqreplace(mLastErrorMessage.length(), buflen, buffer); } @@ -1139,7 +1139,7 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const if ( mMessageLength ) // allow +5% for subsequent LF->CRLF and dotstuffing (an average // over 2G-lines gives an average line length of 42-43): - query += "&size=" + TQString::number( qRound( mMessageLength * 1.05 ) ); + query += "&size=" + TQString::number( tqRound( mMessageLength * 1.05 ) ); destination.setPath("/send"); destination.setQuery( query ); |