summaryrefslogtreecommitdiffstats
path: root/kmail/popaccount.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/popaccount.cpp')
-rw-r--r--kmail/popaccount.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 7bb830bc0..b2f55528f 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -27,7 +27,7 @@
#include "popaccount.h"
#include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
#include "progressmanager.h"
#include "kmfoldermgr.h"
#include "kmfiltermgr.h"
@@ -152,7 +152,7 @@ void PopAccount::processNewMail(bool _interactive)
bool b = storePasswd();
if (KIO::PasswordDialog::getNameAndPassword(mLogin, passwd, &b,
i18n("You need to supply a username and a password to access this "
- "mailbox."), false, TQString::null, mName, i18n("Account:"))
+ "mailbox."), false, TQString(), mName, i18n("Account:"))
!= TQDialog::Accepted)
{
checkDone( false, CheckAborted );
@@ -673,7 +673,7 @@ void PopAccount::slotJobFinished() {
kmkernel->folderMgr()->syncAllFolders();
KURL url = getUrl();
- TQMap< QPair<time_t, TQString>, int > idsToSave;
+ TQMap< TQPair<time_t, TQString>, int > idsToSave;
idsToSave.clear();
// Check if we want to keep any messages
if ( mLeaveOnServer && !idsOfMsgsToDelete.isEmpty() ) {
@@ -692,7 +692,7 @@ void PopAccount::slotJobFinished() {
if (msgTime >= timeLimit ||
!mTimeOfNextSeenMsgsMap[mUidForIdMap[*cur]]) {
kdDebug() << "Saving msg id " << *cur << endl;
- QPair<time_t, TQString> msg(msgTime, *cur);
+ TQPair<time_t, TQString> msg(msgTime, *cur);
idsToSave.insert( msg, 1 );
}
}
@@ -702,7 +702,7 @@ void PopAccount::slotJobFinished() {
int numToDelete = idsToSave.count() - mLeaveOnServerCount;
kdDebug() << "numToDelete is " << numToDelete << endl;
if ( numToDelete > 0 && (unsigned)numToDelete < idsToSave.count() ) {
- TQMap< QPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin();
+ TQMap< TQPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin();
for ( int deleted = 0; deleted < numToDelete && cur != idsToSave.end()
; deleted++, cur++ ) {
kdDebug() << "deleting msg id " << cur.key().second << endl;
@@ -715,7 +715,7 @@ void PopAccount::slotJobFinished() {
// Delete more old messages until we're under mLeaveOnServerSize MBs
if ( mLeaveOnServerSize > 0 ) {
double sizeOnServer = 0;
- TQMap< QPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin();
+ TQMap< TQPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin();
for ( ; cur != idsToSave.end(); cur++ ) {
sizeOnServer +=
*mSizeOfNextSeenMsgsDict[ mUidForIdMap[ cur.key().second ] ];
@@ -730,7 +730,7 @@ void PopAccount::slotJobFinished() {
}
}
// Save msgs from deletion
- TQMap< QPair<time_t, TQString>, int >::Iterator it = idsToSave.begin();
+ TQMap< TQPair<time_t, TQString>, int >::Iterator it = idsToSave.begin();
kdDebug() << "Going to save " << idsToSave.count() << endl;
for ( ; it != idsToSave.end(); ++it ) {
kdDebug() << "saving msg id " << it.key().second << endl;
@@ -747,7 +747,7 @@ void PopAccount::slotJobFinished() {
if ( !idsOfMsgsToDelete.isEmpty() ) {
stage = Dele;
if ( mMailCheckProgressItem )
- mMailCheckProgressItem->seStatus(
+ mMailCheckProgressItem->setqStatus(
i18n( "Fetched 1 message from %1. Deleting messages from server...",
"Fetched %n messages from %1. Deleting messages from server...",
numMsgs )
@@ -757,7 +757,7 @@ void PopAccount::slotJobFinished() {
} else {
stage = Quit;
if ( mMailCheckProgressItem )
- mMailCheckProgressItem->seStatus(
+ mMailCheckProgressItem->setqStatus(
i18n( "Fetched 1 message from %1. Terminating transmission...",
"Fetched %n messages from %1. Terminating transmission...",
numMsgs )
@@ -777,7 +777,7 @@ void PopAccount::slotJobFinished() {
}
idsOfMsgsToDelete.clear();
if ( mMailCheckProgressItem )
- mMailCheckProgressItem->seStatus(
+ mMailCheckProgressItem->setqStatus(
i18n( "Fetched 1 message from %1. Terminating transmission...",
"Fetched %n messages from %1. Terminating transmission...",
numMsgs )
@@ -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();
- BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
+ BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
// set mMailCheckProgressItem = 0 before calling setComplete() to prevent
// a race condition
@@ -913,7 +913,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
.arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
.arg(numBytesToRead/1024).arg(mLogin).arg(mHost);
}
- mMailCheckProgressItem->seStatus( msg );
+ mMailCheckProgressItem->setqStatus( msg );
mMailCheckProgressItem->setProgress(
(numBytesToRead <= 100) ? 50 // We never know what the server tells us
// This way of dividing is required for > 21MB of mail
@@ -930,11 +930,11 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
// otherwise stage is List Or Uidl
TQString qdata = data;
qdata = qdata.simplifyWhiteSpace(); // Workaround for Maillennium POP3/UNIBOX
- int spc = qdata.find( ' ' );
+ int spc = qdata.tqfind( ' ' );
if ( stage == List ) {
if ( spc > 0 ) {
TQString length = qdata.mid(spc+1);
- if (length.find(' ') != -1) length.truncate(length.find(' '));
+ if (length.tqfind(' ') != -1) length.truncate(length.tqfind(' '));
int len = length.toInt();
numBytes += len;
TQString id = qdata.left(spc);
@@ -989,7 +989,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
int *size = new int; //malloc(size_of(int));
*size = mMsgsPendingDownload[id];
mSizeOfNextSeenMsgsDict.insert( uid, size );
- if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) {
+ if ( mUidsOfSeenMsgsDict.tqfind( uid ) != 0 ) {
if ( mMsgsPendingDownload.tqcontains( id ) ) {
mMsgsPendingDownload.remove( id );
}