rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kchmviewer@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

17 files changed, 28 insertions, 28 deletions

diff --git a/src/iconstorage.cpp b/src/iconstorage.cpp
index 1c8ce2a..5a1778a 100644
--- a/src/iconstorage.cpp
+++ b/src/iconstorage.cpp
@@ -1282,7 +1282,7 @@ const TQPixmap * KCHMIconStorage::getToolbarPixmap( pixmap_index_t pix )
 
 const TQPixmap * KCHMIconStorage::returnOrLoadImage( unsigned int id, const png_memory_image_t * image )
 {
-	TQMap<unsigned int, TQPixmap*>::iterator it = m_iconMap.tqfind (id);
+	TQMap<unsigned int, TQPixmap*>::iterator it = m_iconMap.find (id);
 
 	if ( it == m_iconMap.end() )
 	{
diff --git a/src/kchmconfig.cpp b/src/kchmconfig.cpp
index 2e3df0b..5918a2c 100644
--- a/src/kchmconfig.cpp
+++ b/src/kchmconfig.cpp
@@ -189,7 +189,7 @@ bool KCHMConfig::save( )
 
 void KCHMConfig::addFileToHistory( const TQString & file )
 {
-	TQStringList::Iterator itr = m_History.tqfind( file );
+	TQStringList::Iterator itr = m_History.find( file );
 	
 	// check whether file already exists in history - more it forward
 	if ( itr != m_History.end() )
diff --git a/src/kchmcontentswindow.cpp b/src/kchmcontentswindow.cpp
index dce5383..5458409 100644
--- a/src/kchmcontentswindow.cpp
+++ b/src/kchmcontentswindow.cpp
@@ -86,7 +86,7 @@ void KCHMContentsWindow::refillTableOfContents( )
 KCHMIndTocItem * KCHMContentsWindow::getTreeItem( const TQString & url )
 {
 	TQString fixedstr = ::mainWindow->chmFile()->normalizeUrl( url );
-	TQMap<TQString, KCHMIndTocItem*>::const_iterator it = m_urlListMap.tqfind( fixedstr );
+	TQMap<TQString, KCHMIndTocItem*>::const_iterator it = m_urlListMap.find( fixedstr );
 	
 	if ( it == m_urlListMap.end() )
 		return 0;
diff --git a/src/kchmindexwindow.cpp b/src/kchmindexwindow.cpp
index 4853f13..04c68cf 100644
--- a/src/kchmindexwindow.cpp
+++ b/src/kchmindexwindow.cpp
@@ -80,7 +80,7 @@ KCHMIndexWindow::KCHMIndexWindow ( TQWidget * tqparent, const char * name, WFlag
 
 void KCHMIndexWindow::onTextChanged ( const TQString & newvalue)
 {
-	m_lastSelectedItem = m_indexList->tqfindItem (newvalue, 0, TQt::BeginsWith);
+	m_lastSelectedItem = m_indexList->findItem (newvalue, 0, TQt::BeginsWith);
 	
 	if ( m_lastSelectedItem )
 	{
@@ -124,7 +124,7 @@ void KCHMIndexWindow::onDoubleClicked( TQListViewItem *item, const TQPoint &, in
 
 	if ( url[0] == ':' ) // 'see also' link
 	{
-		m_lastSelectedItem = m_indexList->tqfindItem (url.mid(1), 0);
+		m_lastSelectedItem = m_indexList->findItem (url.mid(1), 0);
 		if ( m_lastSelectedItem )
 		{
 			m_indexList->ensureItemVisible (m_lastSelectedItem);
diff --git a/src/kchmsearchengine.cpp b/src/kchmsearchengine.cpp
index cf79e2b..a5f0a11 100644
--- a/src/kchmsearchengine.cpp
+++ b/src/kchmsearchengine.cpp
@@ -218,14 +218,14 @@ bool KCHMSearchEngine::searchQuery( const TQString & query, TQStringList * resul
 		}
 		
 		// If new char does not stop the word, add ot and continue
-		if ( ch.isLetterOrNumber() || partOfWordChars.tqfind( ch ) != -1 )
+		if ( ch.isLetterOrNumber() || partOfWordChars.find( ch ) != -1 )
 		{
 			term.append( ch );
 			continue;
 		}
 		
 		// If it is a split char, add this term and split char as separate term
-		if ( splitChars.tqfind( ch ) != -1 )
+		if ( splitChars.find( ch ) != -1 )
 		{
 			// Add existing term if present
 			keeper.addTerm( term );
diff --git a/src/kchmsearchengine_impl.cpp b/src/kchmsearchengine_impl.cpp
index 52515c7..646f261 100644
--- a/src/kchmsearchengine_impl.cpp
+++ b/src/kchmsearchengine_impl.cpp
@@ -293,14 +293,14 @@ bool Index::parseDocumentToStringlist( const TQString & filename, TQStringList &
 		
 		// Ok, we have a valid character outside HTML tags, and probably some in buffer already.
 		// If it is char or letter, add it and continue
-		if ( ch.isLetterOrNumber() || m_charsword.tqfind( ch ) != -1 )
+		if ( ch.isLetterOrNumber() || m_charsword.find( ch ) != -1 )
 		{
 			parsedbuf.append( ch );
 			continue;
 		}
 		
 		// If it is a split char, add the word to the dictionary, and then add the char itself.
-		if ( m_charssplit.tqfind( ch ) != -1 )
+		if ( m_charssplit.find( ch ) != -1 )
 		{
 			if ( !parsedbuf.isEmpty() )
 				tokenlist.push_back( parsedbuf.lower() );
@@ -551,7 +551,7 @@ bool Index::searchForPhrases( const TQStringList &phrases, const TQStringList &w
 			
 			while ( dict_it != first_word_positions.end() )
 			{
-				if ( next_word_it.tqfind( *dict_it + 1 ) != next_word_it.end() )
+				if ( next_word_it.find( *dict_it + 1 ) != next_word_it.end() )
 				{
 					(*dict_it)++;
 					++dict_it;
diff --git a/src/kchmsearchtoolbar.cpp b/src/kchmsearchtoolbar.cpp
index f87bf50..411dba8 100644
--- a/src/kchmsearchtoolbar.cpp
+++ b/src/kchmsearchtoolbar.cpp
@@ -233,7 +233,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * tqparent )
 		const LCHMTextEncoding * item = enctable + idx;
 		
 		// This menu is only for charsets, so we won't add duplicate charset twice
-		if ( addedCharsets.tqfind( item->qtcodec ) != addedCharsets.end() )
+		if ( addedCharsets.find( item->qtcodec ) != addedCharsets.end() )
 			continue;
 		
 		addedCharsets[ item->qtcodec ] = true;
diff --git a/src/kchmsearchwindow.cpp b/src/kchmsearchwindow.cpp
index 7cd8659..995293d 100644
--- a/src/kchmsearchwindow.cpp
+++ b/src/kchmsearchwindow.cpp
@@ -167,7 +167,7 @@ void KCHMSearchWindow::onHelpClicked( )
 	{
 		TQMessageBox::information ( this, 
 			i18n( "How to use search"), 
-			i18n( "<html><p>The improved search engine allows you to search for a word, symbol or phrase, which is set of words and symbols included in quotes. Only the documents which include all the terms speficide in th search query are shown; no prefixes needed.<p>Unlike MS CHM internal search index, my improved search engine indexes everything, including special symbols. Therefore it is possible to search (and tqfind!) for something like <i>$q = new ChmFile();</i>. This search also fully supports Unicode, which means that you can search in non-English documents.<p>If you want to search for a quote symbol, use quotation mark instead. The engine treats a quote and a quotation mark as the same symbol, which allows to use them in phrases.</html>") );
+			i18n( "<html><p>The improved search engine allows you to search for a word, symbol or phrase, which is set of words and symbols included in quotes. Only the documents which include all the terms speficide in th search query are shown; no prefixes needed.<p>Unlike MS CHM internal search index, my improved search engine indexes everything, including special symbols. Therefore it is possible to search (and find!) for something like <i>$q = new ChmFile();</i>. This search also fully supports Unicode, which means that you can search in non-English documents.<p>If you want to search for a quote symbol, use quotation mark instead. The engine treats a quote and a quotation mark as the same symbol, which allows to use them in phrases.</html>") );
 	}
 	else
 	{
diff --git a/src/kchmsourcefactory.cpp b/src/kchmsourcefactory.cpp
index 896a447..4b6e0a0 100644
--- a/src/kchmsourcefactory.cpp
+++ b/src/kchmsourcefactory.cpp
@@ -49,7 +49,7 @@ const TQMimeSource * KCHMSourceFactory::data( const TQString & abs_name ) const
 	if ( !chm )
 		return 0;
 
-	int pos = path.tqfind ('#');
+	int pos = path.find ('#');
 	if ( pos != -1 )
 		path = path.left (pos);
 	
diff --git a/src/kchmtreeviewitem.cpp b/src/kchmtreeviewitem.cpp
index 5b1a530..afa8ff4 100644
--- a/src/kchmtreeviewitem.cpp
+++ b/src/kchmtreeviewitem.cpp
@@ -60,7 +60,7 @@ const TQPixmap * KCHMIndTocItem::pixmap( int i ) const
 
 TQString KCHMIndTocItem::getUrl( ) const
 {
-	if ( url.tqfind ('|') == -1 )
+	if ( url.find ('|') == -1 )
 		return url;
 
 	// Create a dialog with URLs, and show it, so user can select an URL he/she wants.
@@ -114,7 +114,7 @@ void KCHMIndTocItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu
     TQColorGroup newcg ( cg );
     TQColor c = newcg.text();
 
-	if ( url.tqfind ('|') != -1 )
+	if ( url.find ('|') != -1 )
         newcg.setColor( TQColorGroup::Text, TQt::red );
 	else if ( url[0] == ':' )
         newcg.setColor( TQColorGroup::Text, TQt::lightGray );
diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp
index b125d44..bc758bb 100644
--- a/src/kchmviewwindow.cpp
+++ b/src/kchmviewwindow.cpp
@@ -84,7 +84,7 @@ TQString KCHMViewWindow::makeURLabsolute ( const TQString & url, bool set_as_bas
 			m_base_url = newurl;
 		
 			// and set up new baseurl
-			int i = newurl.tqfindRev('/');
+			int i = newurl.findRev('/');
 			if ( i != -1 )
 				m_base_url = TQDir::cleanDirPath (newurl.left (i + 1));
 		}
@@ -305,7 +305,7 @@ void KCHMViewWindow::setTabKeeper( const TQString & link )
 	if ( m_newTabLinkKeeper[0] == '#' && !m_openedPage.isEmpty() )
 	{
 			// Clean up opened page URL
-		int pos = m_openedPage.tqfind ('#');
+		int pos = m_openedPage.find ('#');
 		TQString fixedpath = pos == -1 ? m_openedPage : m_openedPage.left (pos);
 		m_newTabLinkKeeper = fixedpath + m_newTabLinkKeeper;
 	}
diff --git a/src/kchmviewwindow.h b/src/kchmviewwindow.h
index dd49674..cc67db1 100644
--- a/src/kchmviewwindow.h
+++ b/src/kchmviewwindow.h
@@ -50,7 +50,7 @@ public:
 	//! Popups the print dialog, and prints the current page on the printer.
 	virtual bool	printCurrentPage() = 0;
 
-	//! Continues the tqfind-in-page search forward or backward
+	//! Continues the find-in-page search forward or backward
 	virtual void	searchWord( const TQString & word, bool forward = true, bool casesensitive = false ) = 0;
 
 	//! Return current ZoomFactor.
diff --git a/src/kchmviewwindow_qtextbrowser.cpp b/src/kchmviewwindow_qtextbrowser.cpp
index 82b7693..d519b12 100644
--- a/src/kchmviewwindow_qtextbrowser.cpp
+++ b/src/kchmviewwindow_qtextbrowser.cpp
@@ -207,7 +207,7 @@ void KCHMViewWindow_QTextBrowser::searchWord( const TQString & word, bool forwar
 		m_searchText = word;
 	}
 
-	if ( tqfind (m_searchText, false, false, forward, &m_searchLastParagraph, &m_searchLastIndex) )
+	if ( find (m_searchText, false, false, forward, &m_searchLastParagraph, &m_searchLastIndex) )
 		::mainWindow->showInStatusBar( i18n( "Search failed") );
 }
 
diff --git a/src/kchmviewwindow_qtextbrowser.h b/src/kchmviewwindow_qtextbrowser.h
index 2a87716..ef9be43 100644
--- a/src/kchmviewwindow_qtextbrowser.h
+++ b/src/kchmviewwindow_qtextbrowser.h
@@ -56,7 +56,7 @@ public:
 	//! Popups the print dialog, and prints the current page on the printer.
 	virtual bool	printCurrentPage();
 
-	//! Initiates the tqfind-in-page search, if succeed, cursor moved to the first entry
+	//! Initiates the find-in-page search, if succeed, cursor moved to the first entry
 	virtual void	searchWord( const TQString & word, bool forward = true, bool casesensitive = false );
 
 	//! Select the content of the whole page
diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp
index 7c40b94..b65cf7c 100644
--- a/src/kchmviewwindowmgr.cpp
+++ b/src/kchmviewwindowmgr.cpp
@@ -83,7 +83,7 @@ KCHMViewWindow * KCHMViewWindowMgr::current()
 	TQWidget * w = currentPage();
 	WindowsIterator it;
 			
-	if ( !w || (it = m_Windows.tqfind( w )) == m_Windows.end() )
+	if ( !w || (it = m_Windows.find( w )) == m_Windows.end() )
 		qFatal( "KCHMViewWindowMgr::current called without any windows!" );
 	
 	return it.data().window;
@@ -128,7 +128,7 @@ void KCHMViewWindowMgr::deleteAllWindows( )
 
 void KCHMViewWindowMgr::setTabName( KCHMViewWindow * window )
 {
-	WindowsIterator it = m_Windows.tqfind( window->getTQWidget() );
+	WindowsIterator it = m_Windows.find( window->getTQWidget() );
 			
 	if ( it == m_Windows.end() )
 		qFatal( "KCHMViewWindowMgr::setTabName called with unknown window!" );
@@ -177,7 +177,7 @@ void KCHMViewWindowMgr::closeCurrentWindow( )
 	TQWidget * w = currentPage();
 	WindowsIterator it;
 			
-	if ( !w || (it = m_Windows.tqfind( w )) == m_Windows.end() )
+	if ( !w || (it = m_Windows.find( w )) == m_Windows.end() )
 		qFatal( "KCHMViewWindowMgr::closeCurrentWindow called without any windows!" );
 	
 	closeWindow( it.data() );
@@ -185,7 +185,7 @@ void KCHMViewWindowMgr::closeCurrentWindow( )
 
 void KCHMViewWindowMgr::closeWindow( const tab_window_t & tab )
 {
-	WindowsIterator it = m_Windows.tqfind( tab.widget );
+	WindowsIterator it = m_Windows.find( tab.widget );
 			
 	if ( it == m_Windows.end() )
 		qFatal( "KCHMViewWindowMgr::closeWindow called with unknown widget!" );
@@ -253,7 +253,7 @@ void KCHMViewWindowMgr::saveSettings( KCHMSettings::viewindow_saved_settings_t &
 	for ( int i = 0; i < count(); i++ )
 	{
 		TQWidget * p = page( i );
-		WindowsIterator it = m_Windows.tqfind( p );
+		WindowsIterator it = m_Windows.find( p );
 			
 		if ( it == m_Windows.end() )
 			qFatal( "KCHMViewWindowMgr::saveSettings: could not find widget!" );
@@ -274,7 +274,7 @@ void KCHMViewWindowMgr::updateCloseButtons( )
 
 void KCHMViewWindowMgr::onTabChanged( TQWidget * newtab )
 {
-	WindowsIterator it = m_Windows.tqfind( newtab );
+	WindowsIterator it = m_Windows.find( newtab );
 			
 	if ( it == m_Windows.end() )
 		qFatal( "KCHMViewWindowMgr::onTabChanged called with unknown widget!" );
diff --git a/src/kde/kchmviewwindow_khtmlpart.h b/src/kde/kchmviewwindow_khtmlpart.h
index b2d5aa6..c319a08 100644
--- a/src/kde/kchmviewwindow_khtmlpart.h
+++ b/src/kde/kchmviewwindow_khtmlpart.h
@@ -68,7 +68,7 @@ public:
 	//! Popups the print dialog, and prints the current page on the printer.
 	virtual bool	printCurrentPage();
 
-	//! Initiates the tqfind-in-page search, if succeed, cursor moved to the first entry
+	//! Initiates the find-in-page search, if succeed, cursor moved to the first entry
 	virtual void	searchWord( const TQString & word, bool forward = true, bool casesensitive = false );
 
 	//! Select the content of the whole page
diff --git a/src/kqrunprocess.h b/src/kqrunprocess.h
index 721599f..0cd165e 100644
--- a/src/kqrunprocess.h
+++ b/src/kqrunprocess.h
@@ -29,7 +29,7 @@ static bool run_process( const TQString& command, const TQString& filename )
 	
 	// To be safe, URL should contain no quotes, apostrofes and \0 symbols
 	safefilename.remove (TQRegExp ("['\"\0]"));
-	preparedcommand.tqreplace( "%s", safefilename );
+	preparedcommand.replace( "%s", safefilename );
 
 	// And run an external command with fork()s
 	switch ( fork() )