From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: 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 --- kmail/index.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kmail/index.cpp') diff --git a/kmail/index.cpp b/kmail/index.cpp index ef1ba7de3..632315a52 100644 --- a/kmail/index.cpp +++ b/kmail/index.cpp @@ -60,15 +60,15 @@ const char* const folderIndexDisabledKey = "fulltextIndexDisabled"; #ifdef HAVE_INDEXLIB static -TQValueList vectorToQValueList( const std::vector& input ) { +TQValueList vectorToQValueList( const std::vector& input ) { TQValueList res; std::copy( input.begin(), input.end(), std::back_inserter( res ) ); return res; } static -std::vector QValueListToVector( const TQValueList& input ) { - std::vector res; +std::vector QValueListToVector( const TQValueList& input ) { + std::vector res; // res.assign( input.begin(), input.end() ) doesn't work for some reason for ( TQValueList::const_iterator first = input.begin(), past = input.end(); first != past; ++first ) { res.push_back( *first ); @@ -91,10 +91,10 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ): mSlowDown( false ) { kdDebug( 5006 ) << "KMMsgIndex::KMMsgIndex()" << endl; - connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotRemoveMessage( Q_UINT32 ) ) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotAddMessage( Q_UINT32 ) ) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotRemoveMessage( Q_UINT32 ) ) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotAddMessage( Q_UINT32 ) ) ); + connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( TQ_UINT32 ) ) ); + connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( TQ_UINT32 ) ) ); + connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( TQ_UINT32 ) ) ); + connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( TQ_UINT32 ) ) ); connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) ); //connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) ); @@ -272,7 +272,7 @@ void KMMsgIndex::maintenance() { #endif } -int KMMsgIndex::addMessage( Q_UINT32 serNum ) { +int KMMsgIndex::addMessage( TQ_UINT32 serNum ) { kdDebug( 5006 ) << "KMMsgIndex::addMessage( " << serNum << " )" << endl; if ( mState == s_error ) return 0; #ifdef HAVE_INDEXLIB @@ -407,7 +407,7 @@ bool KMMsgIndex::startQuery( KMSearch* s ) { connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SIGNAL( finished( bool ) ) ); connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SLOT( indexFinished() ) ); connect( search, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( removeSearch( TQObject* ) ) ); - connect( search, TQT_SIGNAL( found( Q_UINT32 ) ), s, TQT_SIGNAL( found( Q_UINT32 ) ) ); + connect( search, TQT_SIGNAL( found( TQ_UINT32 ) ), s, TQT_SIGNAL( found( TQ_UINT32 ) ) ); mSearches.push_back( search ); return true; } @@ -449,13 +449,13 @@ bool KMMsgIndex::stopQuery( KMSearch* s ) { return false; } -std::vector KMMsgIndex::simpleSearch( TQString s, bool* ok ) const { +std::vector KMMsgIndex::simpleSearch( TQString s, bool* ok ) const { kdDebug( 5006 ) << "KMMsgIndex::simpleSearch( -" << s.latin1() << "- )" << endl; if ( mState == s_error || mState == s_disabled ) { if ( ok ) *ok = false; - return std::vector(); + return std::vector(); } - std::vector res; + std::vector res; #ifdef HAVE_INDEXLIB assert( mIndex ); std::vector residx = mIndex->search( s.latin1() )->list(); @@ -482,7 +482,7 @@ bool KMMsgIndex::canHandleQuery( const KMSearchPattern* pat ) const { return false; } -void KMMsgIndex::slotAddMessage( Q_UINT32 serNum ) { +void KMMsgIndex::slotAddMessage( TQ_UINT32 serNum ) { kdDebug( 5006 ) << "KMMsgIndex::slotAddMessage( . , " << serNum << " )" << endl; if ( mState == s_error || mState == s_disabled ) return; @@ -493,7 +493,7 @@ void KMMsgIndex::slotAddMessage( Q_UINT32 serNum ) { scheduleAction(); } -void KMMsgIndex::slotRemoveMessage( Q_UINT32 serNum ) { +void KMMsgIndex::slotRemoveMessage( TQ_UINT32 serNum ) { kdDebug( 5006 ) << "KMMsgIndex::slotRemoveMessage( . , " << serNum << " )" << endl; if ( mState == s_error || mState == s_disabled ) return; @@ -509,7 +509,7 @@ void KMMsgIndex::scheduleAction() { #endif } -void KMMsgIndex::removeMessage( Q_UINT32 serNum ) { +void KMMsgIndex::removeMessage( TQ_UINT32 serNum ) { kdDebug( 5006 ) << "KMMsgIndex::removeMessage( " << serNum << " )" << endl; if ( mState == s_error || mState == s_disabled ) return; @@ -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::fromLatin1( " %1 " ).arg( rule->contents() ); + terms += TQString::tqfromLatin1( " %1 " ).arg( rule->contents() ); } mValues = kmkernel->msgIndex()->simpleSearch( terms, 0 ); -- cgit v1.2.1