summaryrefslogtreecommitdiffstats
path: root/kmail/kmsender.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmsender.cpp')
-rw-r--r--kmail/kmsender.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 8870976f9..eec0d6e00 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -77,10 +77,10 @@ KMSender::~KMSender()
}
//-----------------------------------------------------------------------------
-void KMSender::seStatusMsg(const TQString &msg)
+void KMSender::setStatusMsg(const TQString &msg)
{
if ( mProgressItem )
- mProgressItem->seStatus(msg);
+ mProgressItem->setStatus(msg);
}
//-----------------------------------------------------------------------------
@@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
KMFolder * const outbox = kmkernel->outboxFolder();
const KMFolderOpener openOutbox( outbox, "outbox" );
- aMsg->seStatus(KMMsgStatusQueued);
+ aMsg->setStatus(KMMsgStatusQueued);
if ( const int err = outbox->addMsg(aMsg) ) {
Q_UNUSED( err );
@@ -314,8 +314,8 @@ void KMSender::doSendMsg()
mCurrentMsg->addBodyPart( &msgPart );
}
}
- mCurrentMsg->seStatus(KMMsgStatusSent);
- mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
+ mCurrentMsg->setStatus(KMMsgStatusSent);
+ mCurrentMsg->setStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
mCurrentMsg->updateAttachmentState();
mCurrentMsg->updateInvitationState();
@@ -387,7 +387,7 @@ void KMSender::doSendMsg()
"\"outbox\" to the \"sent-mail\" folder failed.\n"
"Possible reasons are lack of disk space or write permission. "
"Please try to fix the problem and move the message manually.")
- .tqarg(mCurrentMsg->subject()));
+ .arg(mCurrentMsg->subject()));
cleanup();
return;
}
@@ -400,7 +400,7 @@ void KMSender::doSendMsg()
default:
break;
}
- seStatusByLink( mCurrentMsg );
+ setStatusByLink( 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:
@@ -435,7 +435,7 @@ void KMSender::doSendMsg()
"identity '%1' in the Identities "
"section of the configuration dialog "
"and then try again." )
- .tqarg( id.identityName() ) );
+ .arg( id.identityName() ) );
mOutboxFolder->unGetMsg( mFailedMessages );
mCurrentMsg = 0;
}
@@ -450,12 +450,12 @@ void KMSender::doSendMsg()
sentFolder->close("sentFolder");
if ( someSent ) {
if ( mSentMessages == mTotalMessages ) {
- seStatusMsg(i18n("%n queued message successfully sent.",
+ setStatusMsg(i18n("%n queued message successfully sent.",
"%n queued messages successfully sent.",
mSentMessages));
} else {
- seStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
- .tqarg(mSentMessages).tqarg( mTotalMessages ));
+ setStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
+ .arg(mSentMessages).arg( mTotalMessages ));
}
}
cleanup();
@@ -536,7 +536,7 @@ void KMSender::doSendMsg()
}
bool KMSender::runPrecommand( const TQString & cmd ) {
- seStatusMsg( i18n("Executing precommand %1").tqarg( cmd ) );
+ setStatusMsg( 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
- seStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
+ setStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
mSendProc = 0;
mSendProcStarted = false;
cleanup();
@@ -595,9 +595,9 @@ void KMSender::doSendMsgAux()
// start sending the current message
- seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
- .tqarg(mSentMessages+mFailedMessages+1).tqarg(mTotalMessages)
- .tqarg(mCurrentMsg->subject()));
+ setStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
+ .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages)
+ .arg(mCurrentMsg->subject()));
TQStringList to, cc, bcc;
TQString sender;
extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc );
@@ -614,7 +614,7 @@ void KMSender::doSendMsgAux()
mOutboxFolder->unGetMsg( mFailedMessages );
mCurrentMsg = 0;
cleanup();
- seStatusMsg(i18n("Failed to send (some) queued messages."));
+ setStatusMsg(i18n("Failed to send (some) queued messages."));
return;
}
// Do *not* add code here, after send(). It can happen that this method
@@ -696,10 +696,10 @@ void KMSender::slotIdle()
"fix the problem (e.g. a broken address) or remove the message "
"from the 'outbox' folder.\n"
"The following transport protocol was used:\n %2")
- .tqarg(errString)
- .tqarg(mMethodStr);
+ .arg(errString)
+ .arg(mMethodStr);
if (!errString.isEmpty()) KMessageBox::error(0,msg);
- seStatusMsg( i18n( "Sending aborted." ) );
+ setStatusMsg( i18n( "Sending aborted." ) );
} else {
if (!mSendProc->sendOk()) {
if ( mCurrentMsg )
@@ -724,8 +724,8 @@ void KMSender::slotIdle()
"from the 'outbox' folder.</p>"
"<p>The following transport protocol was used: %2</p>"
"<p>Do you want me to continue sending the remaining messages?</p>")
- .tqarg(errString)
- .tqarg(mMethodStr);
+ .arg(errString)
+ .arg(mMethodStr);
res = KMessageBox::warningYesNo( 0 , msg ,
i18n( "Continue Sending" ), i18n( "&Continue Sending" ),
i18n("&Abort Sending") );
@@ -735,8 +735,8 @@ void KMSender::slotIdle()
"fix the problem (e.g. a broken address) or remove the message "
"from the 'outbox' folder.\n"
"The following transport protocol was used:\n %2")
- .tqarg(errString)
- .tqarg(mMethodStr);
+ .arg(errString)
+ .arg(mMethodStr);
KMessageBox::error(0,msg);
}
if (res == KMessageBox::Yes) {
@@ -744,7 +744,7 @@ void KMSender::slotIdle()
doSendMsg();
return;
} else {
- seStatusMsg( i18n( "Sending aborted." ) );
+ setStatusMsg( i18n( "Sending aborted." ) );
}
}
} else {
@@ -845,7 +845,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport )
}
//-----------------------------------------------------------------------------
-void KMSender::seStatusByLink(const KMMessage *aMsg)
+void KMSender::setStatusByLink(const KMMessage *aMsg)
{
int n = 0;
while (1) {
@@ -867,7 +867,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg)
new KMDeleteMsgCommand( folder, folder->getMsg( index ) );
cmd->start();
} else {
- folder->seStatus(index, status);
+ folder->setStatus(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->seStatusMsg(aMsg);
+ if (mSender) mSender->setStatusMsg(aMsg);
}
//=============================================================================
@@ -934,8 +934,8 @@ bool KMSendSendmail::doStart() {
"Please remove it from there if you do not want the message to "
"be resent.\n"
"The following transport protocol was used:\n %2")
- .tqarg(str + "\n")
- .tqarg("sendmail://");
+ .arg(str + "\n")
+ .arg("sendmail://");
KMessageBox::information(0,msg);
return false;
}
@@ -978,7 +978,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c
if ( !mMailerProc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
KMessageBox::information( 0, i18n("Failed to execute mailer program %1")
- .tqarg( mSender->transportInfo()->host ) );
+ .arg( mSender->transportInfo()->host ) );
return false;
}
mMsgPos = mMsgStr.data();
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-24 20:04:25 +0000