3 files changed, 25 insertions, 25 deletions

diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 73216c9e..82003488 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -168,11 +168,11 @@ void KviHelpWindow::startSearch()
 {
 
     TQString str = m_pTermsEdit->text();
-    str = str.tqreplace( "\'", "\"" );
-    str = str.tqreplace( "`", "\"" );
+    str = str.replace( "\'", "\"" );
+    str = str.replace( "`", "\"" );
     TQString buf = str;
-    str = str.tqreplace( "-", " " );
-    str = str.tqreplace( TQRegExp( "\\s[\\S]?\\s" ), " " );
+    str = str.replace( "-", " " );
+    str = str.replace( TQRegExp( "\\s[\\S]?\\s" ), " " );
     m_terms = TQStringList::split( " ", str );
     TQStringList termSeq;
     TQStringList seqWords;
@@ -180,32 +180,32 @@ void KviHelpWindow::startSearch()
     for ( ; it != m_terms.end(); ++it ) {
 	(*it) = (*it).simplifyWhiteSpace();
 	(*it) = (*it).lower();
-	(*it) = (*it).tqreplace( "\"", "" );
+	(*it) = (*it).replace( "\"", "" );
     }
-    if ( str.tqcontains( '\"' ) ) {
+    if ( str.contains( '\"' ) ) {
 #ifdef COMPILE_USE_QT4
 	if ( (str.count( '\"' ))%2 == 0 ) {
 #else
-	if ( (str.tqcontains( '\"' ))%2 == 0 ) {
+	if ( (str.contains( '\"' ))%2 == 0 ) {
 #endif
 	    int beg = 0;
 	    int end = 0;
 	    TQString s;
-	    beg = str.tqfind( '\"', beg );
+	    beg = str.find( '\"', beg );
 	    while ( beg != -1 ) {
 		beg++;
-		end = str.tqfind( '\"', beg );
+		end = str.find( '\"', beg );
 		s = str.mid( beg, end - beg );
 		s = s.lower();
 		s = s.simplifyWhiteSpace();
-		if ( s.tqcontains( '*' ) ) {
+		if ( s.contains( '*' ) ) {
 		    TQMessageBox::warning( this, tr( "Full Text Search" ),
 			tr( "Using a wildcard within phrases is not allowed." ) );
 		    return;
 		}
 		seqWords += TQStringList::split( ' ', s );
 		termSeq << s;
-		beg = str.tqfind( '\"', end + 1);
+		beg = str.find( '\"', end + 1);
 	    }
 	} else {
 	    TQMessageBox::warning( this, tr( "Full Text Search" ),
@@ -261,7 +261,7 @@ TQTextBrowser * KviHelpWindow::textBrowser()
 void KviHelpWindow::showIndexTopic()
 {
 	if (m_pIndexSearch->text().isEmpty()|| !m_pIndexListBox->selectedItem()) return;
-	int i=g_pDocIndex->titlesList().tqfindIndex(m_pIndexListBox->selectedItem()->text());
+	int i=g_pDocIndex->titlesList().findIndex(m_pIndexListBox->selectedItem()->text());
 	textBrowser()->setSource(g_pDocIndex->documentList()[ i ]);
 }
 
@@ -283,13 +283,13 @@ void KviHelpWindow::searchInIndex( const TQString &s )
 
 void KviHelpWindow::indexSelected ( int index )
 {
-	int i=g_pDocIndex->titlesList().tqfindIndex(m_pIndexListBox->text(index));
+	int i=g_pDocIndex->titlesList().findIndex(m_pIndexListBox->text(index));
 	textBrowser()->setSource(g_pDocIndex->documentList()[ i ]);
 }
 
 void KviHelpWindow::searchSelected ( int index )
 {
-	int i=g_pDocIndex->titlesList().tqfindIndex(m_pResultBox->text(index));
+	int i=g_pDocIndex->titlesList().findIndex(m_pResultBox->text(index));
 	textBrowser()->setSource(g_pDocIndex->documentList()[ i ]);
 }
 
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index ba5e72f3..46dc4f22 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -329,7 +329,7 @@ TQStringList Index::query( const TQStringList &terms, const TQStringList &termSe
 
 	Entry *e = 0;
 
-	if ( (*it).tqcontains( '*' ) ) {
+	if ( (*it).contains( '*' ) ) {
 
 	    KviValueList<Document> wcts = setupDummyTerm( getWildcardTerms( *it ) );
 
@@ -464,9 +464,9 @@ TQString Index::getDocumentTitle( const TQString &fileName )
 
 
 
-    int start = text.tqfind( "<title>", 0, FALSE ) + 7;
+    int start = text.find( "<title>", 0, FALSE ) + 7;
 
-    int end = text.tqfind( "</title>", 0, FALSE );
+    int end = text.find( "</title>", 0, FALSE );
 
 
 
@@ -521,11 +521,11 @@ TQStringList Index::getWildcardTerms( const TQString &term )
 
 	    }
 
-	    index = text.tqfind( *iter, index );
+	    index = text.find( *iter, index );
 
 	    if ( *iter == terms.last() && index != (int)text.length()-1 ) {
 
-		index = text.tqfindRev( *iter );
+		index = text.findRev( *iter );
 
 		if ( index != (int)text.length() - (int)(*iter).length() ) {
 
@@ -577,7 +577,7 @@ TQStringList Index::split( const TQString &str )
 
     int j = 0;
 
-    int i = str.tqfind( '*', j );
+    int i = str.find( '*', j );
 
 
 
@@ -593,7 +593,7 @@ TQStringList Index::split( const TQString &str )
 
 	j = i + 1;
 
-	i = str.tqfind( '*', j );
+	i = str.find( '*', j );
 
     }
 
@@ -663,7 +663,7 @@ KviValueList<Document> Index::setupDummyTerm( const TQStringList &terms )
 
 	for ( docIt = docs.begin(); docIt != docs.end(); ++docIt ) {
 
-	    if ( maxList.tqfindIndex( *docIt ) == -1 )
+	    if ( maxList.findIndex( *docIt ) == -1 )
 
 		maxList.append( *docIt );
 
@@ -823,7 +823,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList &
 
 	    while ( aIt != a.end() ) {
 
-		if ( b.tqfind( *aIt + 1 ) != b.end() ) {
+		if ( b.find( *aIt + 1 ) != b.end() ) {
 
 		    (*aIt)++;
 
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index af594088..9fcb36ec 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -157,7 +157,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 			doc = "nohelpavailable.html";
 	}
 
-	if(!c->switches()->tqfind('n',"new"))
+	if(!c->switches()->find('n',"new"))
 	{
 		KviHelpWidget * w = (KviHelpWidget *)c->window()->frame()->child("help_widget","KviHelpWidget");
 		if(w)
@@ -166,7 +166,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 			return true;
 		}
 	}
-	if(c->switches()->tqfind('m',"mdi")) 
+	if(c->switches()->find('m',"mdi")) 
 	{
 		KviHelpWindow *w = new KviHelpWindow(c->window()->frame(),"Help browser");
 		w->textBrowser()->setSource(doc);