diff options
Diffstat (limited to 'kmail/kmaccount.cpp')
| -rw-r--r-- | kmail/kmaccount.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 20105acd8..7cadcba97 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -42,8 +42,8 @@ using KMail::FolderJob; #include "kmaccount.moc" //----------------------------------------------------------------------------- -KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent) - : TQObject(tqparent), mPrecommand(precommand) +KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) + : TQObject(parent), mPrecommand(precommand) { BroadcastStatus::instance()->seStatusMsg( i18n("Executing precommand %1").tqarg(precommand )); @@ -220,9 +220,9 @@ bool KMAccount::processNewMsg(KMMessage* aMsg) assert(aMsg != 0); // Save this one for readding - KMFolderCachedImap* tqparent = 0; + KMFolderCachedImap* parent = 0; if( type() == "cachedimap" ) - tqparent = static_cast<KMFolderCachedImap*>( aMsg->storage() ); + parent = static_cast<KMFolderCachedImap*>( aMsg->storage() ); // checks whether we should send delivery receipts // and sends them. @@ -258,7 +258,7 @@ if( fileD0.open( IO_WriteOnly ) ) { else if (processResult == 1) { if( type() == "cachedimap" ) - ; // already done by caller: tqparent->addMsgInternal( aMsg, false ); + ; // already done by caller: parent->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" ) ? tqparent->folder()->idString() + folderId = ( type() == "cachedimap" ) ? parent->folder()->idString() : mFolder->idString(); } else { - folderId = aMsg->tqparent()->idString(); + folderId = aMsg->parent()->idString(); } addToNewInFolder( folderId, 1 ); |