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/popaccount.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/popaccount.cpp')
-rw-r--r-- | kmail/popaccount.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index 94dbf8a5e..7bb830bc0 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -27,7 +27,7 @@ #include "popaccount.h" #include "broadcaststatus.h" -using KPIM::BroadcastStatus; +using KPIM::BroadcasStatus; #include "progressmanager.h" #include "kmfoldermgr.h" #include "kmfiltermgr.h" @@ -514,13 +514,13 @@ void PopAccount::slotJobFinished() { mUidForIdMap[hids.key()], Later));//TODO //set Action if already known - if( mHeaderDeleteUids.contains( headersOnServer.current()->uid() ) ) { + if( mHeaderDeleteUids.tqcontains( headersOnServer.current()->uid() ) ) { headersOnServer.current()->setAction(Delete); } - else if( mHeaderDownUids.contains( headersOnServer.current()->uid() ) ) { + else if( mHeaderDownUids.tqcontains( headersOnServer.current()->uid() ) ) { headersOnServer.current()->setAction(Down); } - else if( mHeaderLaterUids.contains( headersOnServer.current()->uid() ) ) { + else if( mHeaderLaterUids.tqcontains( headersOnServer.current()->uid() ) ) { headersOnServer.current()->setAction(Later); } } @@ -625,7 +625,7 @@ void PopAccount::slotJobFinished() { headersOnServer.current()->action() == Later) { //remove entries from the lists when the mails should not be downloaded //(deleted or downloaded later) - if ( mMsgsPendingDownload.contains( headersOnServer.current()->id() ) ) { + if ( mMsgsPendingDownload.tqcontains( headersOnServer.current()->id() ) ) { mMsgsPendingDownload.remove( headersOnServer.current()->id() ); } if (headersOnServer.current()->action() == Delete) { @@ -747,7 +747,7 @@ void PopAccount::slotJobFinished() { if ( !idsOfMsgsToDelete.isEmpty() ) { stage = Dele; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->setStatus( + mMailCheckProgressItem->seStatus( 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->setStatus( + mMailCheckProgressItem->seStatus( 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->setStatus( + mMailCheckProgressItem->seStatus( 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(); - BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( + BroadcasStatus::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->setStatus( msg ); + mMailCheckProgressItem->seStatus( msg ); mMailCheckProgressItem->setProgress( (numBytesToRead <= 100) ? 50 // We never know what the server tells us // This way of dividing is required for > 21MB of mail @@ -990,7 +990,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data) *size = mMsgsPendingDownload[id]; mSizeOfNextSeenMsgsDict.insert( uid, size ); if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) { - if ( mMsgsPendingDownload.contains( id ) ) { + if ( mMsgsPendingDownload.tqcontains( id ) ) { mMsgsPendingDownload.remove( id ); } else |