summaryrefslogtreecommitdiffstats
path: root/kmail/popaccount.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/popaccount.cpp')
-rw-r--r--kmail/popaccount.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 15efb0e87..8caba1e44 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -167,7 +167,7 @@ void PopAccount::processNewMail(bool _interactive)
}
TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
- mHost + ":" + TQString("%1").tqarg(mPort) );
+ mHost + ":" + TQString("%1").arg(mPort) );
KConfig config( seenUidList );
TQStringList uidsOfSeenMsgs = config.readListEntry( "seenUidList" );
TQValueList<int> timeOfSeenMsgs = config.readIntListEntry( "seenUidTimeList" );
@@ -370,7 +370,7 @@ void PopAccount::startJob()
if (!runPrecommand(precommand()))
{
KMessageBox::sorry(0,
- i18n("Could not execute precommand: %1").tqarg(precommand()),
+ i18n("Could not execute precommand: %1").arg(precommand()),
i18n("KMail Error Message"));
checkDone( false, CheckError );
return;
@@ -401,7 +401,7 @@ void PopAccount::startJob()
mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
"MailCheck" + mName,
escapedName,
- i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ),
+ i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
true, // can be canceled
useSSL() || useTLS() );
connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
@@ -496,7 +496,7 @@ void PopAccount::slotJobFinished() {
"the UIDL command: this command is required to determine, in a reliable way, "
"which of the mails on the server KMail has already seen before;\n"
"the feature to leave the mails on the server will therefore not "
- "work properly.").tqarg(NetworkAccount::name()) );
+ "work properly.").arg(NetworkAccount::name()) );
// An attempt to work around buggy pop servers, these seem to be popular.
mUidsOfNextSeenMsgsDict = mUidsOfSeenMsgsDict;
}
@@ -747,21 +747,21 @@ void PopAccount::slotJobFinished() {
if ( !idsOfMsgsToDelete.isEmpty() ) {
stage = Dele;
if ( mMailCheckProgressItem )
- mMailCheckProgressItem->seStatus(
+ mMailCheckProgressItem->setStatus(
i18n( "Fetched 1 message from %1. Deleting messages from server...",
"Fetched %n messages from %1. Deleting messages from server...",
numMsgs )
- .tqarg( mHost ) );
+ .arg( mHost ) );
url.setPath("/remove/" + idsOfMsgsToDelete.join(","));
kdDebug(5006) << "url: " << url.prettyURL() << endl;
} else {
stage = Quit;
if ( mMailCheckProgressItem )
- mMailCheckProgressItem->seStatus(
+ mMailCheckProgressItem->setStatus(
i18n( "Fetched 1 message from %1. Terminating transmission...",
"Fetched %n messages from %1. Terminating transmission...",
numMsgs )
- .tqarg( mHost ) );
+ .arg( mHost ) );
url.setPath(TQString("/commit"));
kdDebug(5006) << "url: " << url.prettyURL() << endl;
}
@@ -777,11 +777,11 @@ void PopAccount::slotJobFinished() {
}
idsOfMsgsToDelete.clear();
if ( mMailCheckProgressItem )
- mMailCheckProgressItem->seStatus(
+ mMailCheckProgressItem->setStatus(
i18n( "Fetched 1 message from %1. Terminating transmission...",
"Fetched %n messages from %1. Terminating transmission...",
numMsgs )
- .tqarg( mHost ) );
+ .arg( mHost ) );
KURL url = getUrl();
url.setPath(TQString("/commit"));
job = KIO::get( url, false, false );
@@ -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();
- BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
+ BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
// set mMailCheckProgressItem = 0 before calling setComplete() to prevent
// a race condition
@@ -841,7 +841,7 @@ void PopAccount::saveUidList()
seenUidTimeList.append( mTimeOfNextSeenMsgsMap[it.currentKey()] );
}
TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
- mHost + ":" + TQString("%1").tqarg(mPort) );
+ mHost + ":" + TQString("%1").arg(mPort) );
KConfig config( seenUidList );
config.writeEntry( "seenUidList", uidsOfNextSeenMsgs );
config.writeEntry( "seenUidTimeList", seenUidTimeList );
@@ -867,7 +867,7 @@ void PopAccount::slotGetNextMsg()
curMsgStrm = new TQDataStream( curMsgData, IO_WriteOnly );
curMsgLen = nextLen;
++indexOfCurrentMsg;
- kdDebug(5006) << TQString("Length of message about to get %1").tqarg( nextLen ) << endl;
+ kdDebug(5006) << TQString("Length of message about to get %1").arg( nextLen ) << endl;
mMsgsPendingDownload.remove( next.key() );
}
}
@@ -904,16 +904,16 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
{
msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 "
"(%7 KB remain on the server).")
- .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024)
- .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost).tqarg(numBytes/1024);
+ .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
+ .arg(numBytesToRead/1024).arg(mLogin).arg(mHost).arg(numBytes/1024);
}
else
{
msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6.")
- .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024)
- .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost);
+ .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
+ .arg(numBytesToRead/1024).arg(mLogin).arg(mHost);
}
- mMailCheckProgressItem->seStatus( msg );
+ mMailCheckProgressItem->setStatus( msg );
mMailCheckProgressItem->setProgress(
(numBytesToRead <= 100) ? 50 // We never know what the server tells us
// This way of dividing is required for > 21MB of mail