1 files changed, 16 insertions, 16 deletions

diff --git a/kmail/index.cpp b/kmail/index.cpp
index 632315a5..f824880f 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -16,11 +16,11 @@
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -60,14 +60,14 @@ const char* const folderIndexDisabledKey = "fulltextIndexDisabled";
 
 #ifdef HAVE_INDEXLIB
 static
-TQValueList<int> vectorToQValueList( const std::vector<TQ_UINT32>& input ) {
+TQValueList<int> vectorToTQValueList( const std::vector<TQ_UINT32>& input ) {
 	TQValueList<int> res;
 	std::copy( input.begin(), input.end(), std::back_inserter( res ) );
 	return res;
 }
 
 static
-std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) {
+std::vector<TQ_UINT32> TQValueListToVector( const TQValueList<int>& input ) {
 	std::vector<TQ_UINT32> res;
 	// res.assign( input.begin(), input.end() ) doesn't work for some reason
 	for ( TQValueList<int>::const_iterator first = input.begin(), past = input.end(); first != past; ++first ) {
@@ -77,8 +77,8 @@ std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) {
 }
 #endif
 
-KMMsgIndex::KMMsgIndex( TQObject* parent ):
-	TQObject( parent, "index" ),
+KMMsgIndex::KMMsgIndex( TQObject* tqparent ):
+	TQObject( tqparent, "index" ),
 	mState( s_idle ),
 #ifdef HAVE_INDEXLIB
 	mLockFile( std::string( static_cast<const char*>( TQFile::encodeName( defaultPath() ) + "/lock" ) ) ),
@@ -123,8 +123,8 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 			TQTimer::singleShot( 8000, this, TQT_SLOT( continueCreation() ) );
 			mState = s_creating;
 		} else {
-			mPendingMsgs = QValueListToVector( cfg.readIntListEntry( "pending" ) );
-			mRemovedMsgs = QValueListToVector( cfg.readIntListEntry( "removed" ) );
+			mPendingMsgs = TQValueListToVector( cfg.readIntListEntry( "pending" ) );
+			mRemovedMsgs = TQValueListToVector( cfg.readIntListEntry( "removed" ) );
 		}
 	}
 	mIndex = 0;
@@ -143,17 +143,17 @@ KMMsgIndex::~KMMsgIndex() {
 	TQValueList<int> pendingMsg;
 	if ( mState == s_processing ) {
 		Q_ASSERT( mAddedMsgs.empty() );
-		pendingMsg = vectorToQValueList( mPendingMsgs );
+		pendingMsg = vectorToTQValueList( mPendingMsgs );
 	}
 	cfg.writeEntry( "pending", pendingMsg );
-	cfg.writeEntry( "removed", vectorToQValueList( mRemovedMsgs ) );
+	cfg.writeEntry( "removed", vectorToTQValueList( mRemovedMsgs ) );
 	delete mIndex;
 #endif
 }
 
 bool KMMsgIndex::isIndexable( KMFolder* folder ) const {
-	if ( !folder || !folder->parent() ) return false;
-	const KMFolderMgr* manager = folder->parent()->manager();
+	if ( !folder || !folder->tqparent() ) return false;
+	const KMFolderMgr* manager = folder->tqparent()->manager();
 	return manager == kmkernel->folderMgr() || manager == kmkernel->dimapFolderMgr();
 }
 
@@ -219,9 +219,9 @@ void KMMsgIndex::setIndexingEnabled( KMFolder* folder, bool e ) {
 				// create() will notice that folder is disabled
 				break;
 			case s_creating:
-				if ( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
+				if ( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
 					// easy:
-					mPendingFolders.erase( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) );
+					mPendingFolders.erase( std::tqfind( 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::find( mSearches.begin(), mSearches.end(), destroyed ) );
+	mSearches.erase( std::tqfind( mSearches.begin(), mSearches.end(), destroyed ) );
 }