diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kmail/kmaccount.cpp | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmaccount.cpp')
-rw-r--r-- | kmail/kmaccount.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 8ddf6899a..eebe99f76 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -12,7 +12,7 @@ using KMail::AccountManager; #include "messagesender.h" #include "kmmessage.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "kmfoldercachedimap.h" #include "progressmanager.h" @@ -42,10 +42,10 @@ using KMail::FolderJob; #include "kmaccount.moc" //----------------------------------------------------------------------------- -KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) - : TQObject(parent), mPrecommand(precommand) +KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent) + : TQObject(tqparent), mPrecommand(precommand) { - BroadcasStatus::instance()->seStatusMsg( + BroadcastqStatus::instance()->seStatusMsg( i18n("Executing precommand %1").arg(precommand )); mPrecommandProcess.setUseShell(true); @@ -181,7 +181,7 @@ void KMAccount::writeConfig(KConfig& config) KAccount::writeConfig(config); config.writeEntry("Type", type()); - config.writeEntry("Folder", mFolder ? mFolder->idString() : TQString::null); + config.writeEntry("Folder", mFolder ? mFolder->idString() : TQString()); config.writeEntry("check-interval", mInterval); config.writeEntry("check-exclude", mExclude); config.writePathEntry("precommand", mPrecommand); @@ -220,9 +220,9 @@ bool KMAccount::processNewMsg(KMMessage* aMsg) assert(aMsg != 0); // Save this one for readding - KMFolderCachedImap* parent = 0; + KMFolderCachedImap* tqparent = 0; if( type() == "cachedimap" ) - parent = static_cast<KMFolderCachedImap*>( aMsg->storage() ); + tqparent = static_cast<KMFolderCachedImap*>( aMsg->storage() ); // checks whether we should send delivery receipts // and sends them. @@ -233,10 +233,10 @@ bool KMAccount::processNewMsg(KMMessage* aMsg) // This is only valid for pop accounts and produces wrong stati for imap. if ( type() != "cachedimap" && type() != "imap" ) { if ( aMsg->isOld() ) - aMsg->seStatus(KMMsgStatusUnread); // -sanders - // aMsg->seStatus(KMMsgStatusRead); + aMsg->setqStatus(KMMsgStatusUnread); // -sanders + // aMsg->setqStatus(KMMsgStatusRead); else - aMsg->seStatus(KMMsgStatusNew); + aMsg->setqStatus(KMMsgStatusNew); } /* TQFile fileD0( "testdat_xx-kmaccount-0" ); @@ -258,7 +258,7 @@ if( fileD0.open( IO_WriteOnly ) ) { else if (processResult == 1) { if( type() == "cachedimap" ) - ; // already done by caller: parent->addMsgInternal( aMsg, false ); + ; // already done by caller: tqparent->addMsgInternal( aMsg, false ); else { // TODO: Perhaps it would be best, if this if was handled by a virtual // method, so the if( !dimap ) above could die? @@ -287,11 +287,11 @@ if( fileD0.open( IO_WriteOnly ) ) { // Count number of new messages for each folder TQString folderId; if ( processResult == 1 ) { - folderId = ( type() == "cachedimap" ) ? parent->folder()->idString() + folderId = ( type() == "cachedimap" ) ? tqparent->folder()->idString() : mFolder->idString(); } else { - folderId = aMsg->parent()->idString(); + folderId = aMsg->tqparent()->idString(); } addToNewInFolder( folderId, 1 ); @@ -312,7 +312,7 @@ int KMAccount::checkInterval() const { if ( mInterval <= 0 ) return mInterval; - return QMAX( mInterval, GlobalSettings::self()->minimumCheckInterval() ); + return TQMAX( mInterval, GlobalSettings::self()->minimumCheckInterval() ); } //---------------------------------------------------------------------------- @@ -377,7 +377,7 @@ bool KMAccount::runPrecommand(const TQString &precommand) KMPrecommand precommandProcess(precommand, this); - BroadcasStatus::instance()->seStatusMsg( + BroadcastqStatus::instance()->seStatusMsg( i18n("Executing precommand %1").arg(precommand )); connect(&precommandProcess, TQT_SIGNAL(finished(bool)), @@ -470,7 +470,7 @@ void KMAccount::pseudoAssign( const KMAccount * a ) { } //----------------------------------------------------------------------------- -void KMAccount::checkDone( bool newmail, CheckStatus status ) +void KMAccount::checkDone( bool newmail, ChecktqStatus status ) { setCheckingMail( false ); // Reset the timeout for automatic mailchecking. The user might have @@ -493,7 +493,7 @@ void KMAccount::checkDone( bool newmail, CheckStatus status ) //----------------------------------------------------------------------------- void KMAccount::addToNewInFolder( TQString folderId, int num ) { - if ( mNewInFolder.find( folderId ) == mNewInFolder.end() ) + if ( mNewInFolder.tqfind( folderId ) == mNewInFolder.end() ) mNewInFolder[folderId] = num; else mNewInFolder[folderId] += num; |