summaryrefslogtreecommitdiffstats
path: root/kmail/index.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmail/index.cpp
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/index.cpp')
-rw-r--r--kmail/index.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kmail/index.cpp b/kmail/index.cpp
index f824880fc..a71d27e9c 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -219,9 +219,9 @@ void KMMsgIndex::setIndexingEnabled( KMFolder* folder, bool e ) {
// create() will notice that folder is disabled
break;
case s_creating:
- if ( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
+ if ( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
// easy:
- mPendingFolders.erase( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) );
+ mPendingFolders.erase( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) );
break;
}
//else fall-through
@@ -433,7 +433,7 @@ bool KMMsgIndex::startQuery( KMSearch* s ) {
//}
void KMMsgIndex::removeSearch( TQObject* destroyed ) {
- mSearches.erase( std::tqfind( mSearches.begin(), mSearches.end(), destroyed ) );
+ mSearches.erase( std::find( mSearches.begin(), mSearches.end(), destroyed ) );
}
@@ -550,7 +550,7 @@ void KMMsgIndex::Search::act() {
TQString terms;
for ( KMSearchRule* rule = pat->first(); rule; rule = pat->next() ) {
Q_ASSERT( rule->function() == KMSearchRule::FuncContains );
- terms += TQString::tqfromLatin1( " %1 " ).arg( rule->contents() );
+ terms += TQString::tqfromLatin1( " %1 " ).tqarg( rule->contents() );
}
mValues = kmkernel->msgIndex()->simpleSearch( terms, 0 );