diff options
Diffstat (limited to 'kmail/kmfilter.cpp')
| -rw-r--r-- | kmail/kmfilter.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp index 2f6bbbd78..4441b8611 100644 --- a/kmail/kmfilter.cpp +++ b/kmail/kmfilter.cpp @@ -186,9 +186,9 @@ bool KMFilter::folderRemoved( KMFolder* aFolder, KMFolder* aNewFolder ) void KMFilter::setApplyOnAccount( uint id, bool aApply ) { - if (aApply && !mAccounts.tqcontains( id )) { + if (aApply && !mAccounts.contains( id )) { mAccounts.append( id ); - } else if (!aApply && mAccounts.tqcontains( id )) { + } else if (!aApply && mAccounts.contains( id )) { mAccounts.remove( id ); } } @@ -198,12 +198,12 @@ bool KMFilter::applyOnAccount( uint id ) const if ( applicability() == All ) return true; if ( applicability() == ButImap ) { - KMAccount *account = kmkernel->acctMgr()->tqfind( id ); + KMAccount *account = kmkernel->acctMgr()->find( id ); bool result = account && !dynamic_cast<KMAcctImap*>(account); return result; } if ( applicability() == Checked ) - return mAccounts.tqcontains( id ); + return mAccounts.contains( id ); return false; } @@ -236,9 +236,9 @@ void KMFilter::readConfig(KConfig* config) bApplyOnExplicit = true; mApplicability = ButImap; } else { - bApplyOnInbound = bool(sets.tqcontains("check-mail")); - bApplyOnOutbound = bool(sets.tqcontains("send-mail")); - bApplyOnExplicit = bool(sets.tqcontains("manual-filtering")); + bApplyOnInbound = bool(sets.contains("check-mail")); + bApplyOnOutbound = bool(sets.contains("send-mail")); + bApplyOnExplicit = bool(sets.contains("manual-filtering")); mApplicability = (AccountType)config->readNumEntry( "Applicability", ButImap ); } @@ -363,7 +363,7 @@ void KMFilter::purify() // Remove invalid accounts from mAccounts - just to be tidy TQValueListIterator<int> it2 = mAccounts.begin(); while ( it2 != mAccounts.end() ) { - if ( !kmkernel->acctMgr()->tqfind( *it2 ) ) + if ( !kmkernel->acctMgr()->find( *it2 ) ) it2 = mAccounts.remove( it2 ); else ++it2; @@ -418,8 +418,8 @@ const TQString KMFilter::asString() const if ( mAccounts.isEmpty() ) result += " None"; else for ( it2 = mAccounts.begin() ; it2 != mAccounts.end() ; ++it2 ) - if ( kmkernel->acctMgr()->tqfind( *it2 ) ) - result += " " + kmkernel->acctMgr()->tqfind( *it2 )->name(); + if ( kmkernel->acctMgr()->find( *it2 ) ) + result += " " + kmkernel->acctMgr()->find( *it2 )->name(); result += "\n"; } if ( bStopProcessingHere ) |