From 8cbd3f41229fc385698bfd9a5524ba2610777543 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: 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 --- lib/kio-msits/msits.cpp | 2 +- lib/libchmfile/libchmfileimpl.cpp | 28 ++++++++++++++-------------- lib/libchmfile/qt34.cpp | 24 ++++++++++++------------ lib/libchmfile/qt34.h | 12 ++++++------ src/iconstorage.cpp | 2 +- src/kchmconfig.cpp | 2 +- src/kchmcontentswindow.cpp | 2 +- src/kchmindexwindow.cpp | 4 ++-- src/kchmsearchengine.cpp | 4 ++-- src/kchmsearchengine_impl.cpp | 6 +++--- src/kchmsearchtoolbar.cpp | 2 +- src/kchmsearchwindow.cpp | 2 +- src/kchmsourcefactory.cpp | 2 +- src/kchmtreeviewitem.cpp | 4 ++-- src/kchmviewwindow.cpp | 4 ++-- src/kchmviewwindow.h | 2 +- src/kchmviewwindow_qtextbrowser.cpp | 2 +- src/kchmviewwindow_qtextbrowser.h | 2 +- src/kchmviewwindowmgr.cpp | 12 ++++++------ src/kde/kchmviewwindow_khtmlpart.h | 2 +- src/kqrunprocess.h | 2 +- 21 files changed, 61 insertions(+), 61 deletions(-) diff --git a/lib/kio-msits/msits.cpp b/lib/kio-msits/msits.cpp index bea4d79..0be488f 100755 --- a/lib/kio-msits/msits.cpp +++ b/lib/kio-msits/msits.cpp @@ -141,7 +141,7 @@ bool ProtocolMSITS::parseLoadAndLookup ( const KURL& url, TQString& abspath ) { kdDebug() << "ProtocolMSITS::parseLoadAndLookup (const KURL&) " << url.path() << endl; - int pos = url.path().tqfind ("::"); + int pos = url.path().find ("::"); if ( pos == -1 ) { diff --git a/lib/libchmfile/libchmfileimpl.cpp b/lib/libchmfile/libchmfileimpl.cpp index 71907c5..9ea1d21 100644 --- a/lib/libchmfile/libchmfileimpl.cpp +++ b/lib/libchmfile/libchmfileimpl.cpp @@ -318,7 +318,7 @@ TQString LCHMFileImpl::decodeEntity( const TQString & entity ) } else { - TQMap::const_iterator it = m_entityDecodeMap.tqfind( entity ); + TQMap::const_iterator it = m_entityDecodeMap.find( entity ); if ( it == m_entityDecodeMap.end() ) { @@ -333,12 +333,12 @@ TQString LCHMFileImpl::decodeEntity( const TQString & entity ) inline int LCHMFileImpl::findStringInQuotes (const TQString& tag, int offset, TQString& value, bool firstquote, bool decodeentities) { - int qbegin = tag.tqfind ('"', offset); + int qbegin = tag.find ('"', offset); if ( qbegin == -1 ) qFatal ("LCHMFileImpl::findStringInQuotes: cannot find first quote in tag: '%s'", tag.ascii()); - int qend = firstquote ? tag.tqfind ('"', qbegin + 1) : tag.tqfindRev ('"'); + int qend = firstquote ? tag.find ('"', qbegin + 1) : tag.findRev ('"'); if ( qend == -1 || qend <= qbegin ) qFatal ("LCHMFileImpl::findStringInQuotes: cannot find last quote in tag: '%s'", tag.ascii()); @@ -875,7 +875,7 @@ TQCString LCHMFileImpl::convertSearchWord( const TQString & src ) { int index = dest[i] & 0x7F; if ( searchwordtable[index] ) - dest.tqreplace (i, 1, searchwordtable[index]); + dest.replace (i, 1, searchwordtable[index]); else dest.remove (i, 1); } @@ -895,7 +895,7 @@ void LCHMFileImpl::getSearchResults( const LCHMSearchProgressResults& tempres, for ( unsigned int i = 0; i < tempres.size(); i++ ) { - if ( urlsmap.tqfind (tempres[i].urloff) != urlsmap.end() ) + if ( urlsmap.find (tempres[i].urloff) != urlsmap.end() ) continue; urlsmap[tempres[i].urloff] = 1; @@ -914,7 +914,7 @@ void LCHMFileImpl::getSearchResults( const LCHMSearchProgressResults& tempres, TQString LCHMFileImpl::normalizeUrl( const TQString & path ) const { - int pos = path.tqfind ('#'); + int pos = path.find ('#'); TQString fixedpath = pos == -1 ? path : path.left (pos); return LCHMUrlFactory::makeURLabsoluteIfNeeded( fixedpath ); @@ -957,7 +957,7 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH // Split the HHC file by HTML tags int stringlen = src.length(); - while ( pos < stringlen && (pos = src.tqfind ('<', pos)) != -1 ) + while ( pos < stringlen && (pos = src.find ('<', pos)) != -1 ) { int i, word_end = 0; @@ -967,8 +967,8 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH if ( (src[i] == '"' || src[i] == '\'') ) { // find where quote ends, either by another quote, or by '>' symbol (some people don't know HTML) - int nextpos = src.tqfind (src[i], i+1); - if ( nextpos == -1 && (nextpos = src.tqfind ('>', i+1)) == -1 ) + int nextpos = src.find (src[i], i+1); + if ( nextpos == -1 && (nextpos = src.find ('>', i+1)) == -1 ) { qWarning ("LCHMFileImpl::ParseHhcAndFillTree: corrupted TOC: %s", src.mid(i).ascii()); return false; @@ -992,7 +992,7 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH //qDebug ("tag: '%s', tagword: '%s'\n", tag.ascii(), tagword.ascii()); // - a topic entry - if ( tagword == "object" && tag.tqfind ("text/sitemap", 0, false) != -1 ) + if ( tagword == "object" && tag.find ("text/sitemap", 0, false) != -1 ) in_object = true; else if ( tagword == "/object" && in_object ) { @@ -1033,14 +1033,14 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH TQString name_pattern = "name=", value_pattern = "value="; TQString pname, pvalue; - if ( (offset = tag.tqfind (name_pattern, 0, FALSE)) == -1 ) + if ( (offset = tag.find (name_pattern, 0, FALSE)) == -1 ) qFatal ("LCHMFileImpl::ParseAndFillTopicsTree: bad tag '%s': no name=\n", tag.ascii()); // offset+5 skips 'name=' offset = findStringInQuotes (tag, offset + name_pattern.length(), pname, TRUE, FALSE); pname = pname.lower(); - if ( (offset = tag.tqfind (value_pattern, offset, FALSE)) == -1 ) + if ( (offset = tag.find (value_pattern, offset, FALSE)) == -1 ) qFatal ("LCHMFileImpl::ParseAndFillTopicsTree: bad tag '%s': no value=\n", tag.ascii()); // offset+6 skips 'value=' @@ -1059,7 +1059,7 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH // Check for URL duplication TQString url = LCHMUrlFactory::makeURLabsoluteIfNeeded( pvalue ); - if ( entry.urls.tqfind( url ) == entry.urls.end() ) + if ( entry.urls.find( url ) == entry.urls.end() ) entry.urls.push_back( url ); } else if ( pname == "see also" && asIndex && entry.name != pvalue ) @@ -1137,7 +1137,7 @@ bool LCHMFileImpl::getFileContentAsString( TQString * str, const TQString & url, TQString LCHMFileImpl::getTopicByUrl( const TQString & url ) const { - TQMap< TQString, TQString >::const_iterator it = m_url2topics.tqfind( url ); + TQMap< TQString, TQString >::const_iterator it = m_url2topics.find( url ); if ( it == m_url2topics.end() ) return TQString(); diff --git a/lib/libchmfile/qt34.cpp b/lib/libchmfile/qt34.cpp index e1194f9..cb2f3d8 100644 --- a/lib/libchmfile/qt34.cpp +++ b/lib/libchmfile/qt34.cpp @@ -77,9 +77,9 @@ char LIBCHMCString::at(uint i) const return cs.at(i); } -void LIBCHMCString::tqreplace(uint index, uint len, const char *str) +void LIBCHMCString::replace(uint index, uint len, const char *str) { - cs.tqreplace(index, len, str); + cs.replace(index, len, str); } void LIBCHMCString::remove(uint index, uint len) @@ -162,25 +162,25 @@ const char *LIBCHMString::ascii() const #endif } -int LIBCHMString::tqfind(char c, int index) const +int LIBCHMString::find(char c, int index) const { #if defined (USE_TQT_4) return s.indexOf(c, index); #else - return s.tqfind(c, index); + return s.find(c, index); #endif } -int LIBCHMString::tqfind(const TQChar &c, int index) const +int LIBCHMString::find(const TQChar &c, int index) const { #if defined (USE_TQT_4) return s.indexOf(c, index); #else - return s.tqfind(c, index); + return s.find(c, index); #endif } -int LIBCHMString::tqfind(const TQString &string, int index, bool cs) const +int LIBCHMString::find(const TQString &string, int index, bool cs) const { #if defined (USE_TQT_4) TQt::CaseSensitivity cse; @@ -188,16 +188,16 @@ int LIBCHMString::tqfind(const TQString &string, int index, bool cs) const else cse = TQt::CaseInsensitive; return s.indexOf(string, index, cse); #else - return s.tqfind(string, index, cs); + return s.find(string, index, cs); #endif } -int LIBCHMString::tqfindRev(char c) const +int LIBCHMString::findRev(char c) const { #if defined (USE_TQT_4) return s.lastIndexOf(c); #else - return s.tqfindRev(c); + return s.findRev(c); #endif } @@ -244,9 +244,9 @@ TQString LIBCHMDir::cleanDirPath(const TQString &dir) -bool LIBCHMStringList::tqcontains(const TQStringList &list, const TQString &string) +bool LIBCHMStringList::contains(const TQStringList &list, const TQString &string) { - return list.tqcontains(string); + return list.contains(string); } TQStringList LIBCHMStringList::split(const TQRegExp ®exp, const TQString &string) diff --git a/lib/libchmfile/qt34.h b/lib/libchmfile/qt34.h index 6181c8b..d37c3a2 100644 --- a/lib/libchmfile/qt34.h +++ b/lib/libchmfile/qt34.h @@ -55,7 +55,7 @@ class LIBCHMCString bool isEmpty() const; void prepend(char c); char at(uint i) const; - void tqreplace(uint index, uint len, const char *str); + void replace(uint index, uint len, const char *str); void remove(uint index, uint len); LIBCHMCString lower(); @@ -90,10 +90,10 @@ class LIBCHMString TQString lower() const; const char *ascii() const; - int tqfind(char c, int index = -1) const; - int tqfind(const TQChar &c, int index) const; - int tqfind(const TQString &string, int index, bool cs) const; - int tqfindRev(char c) const; + int find(char c, int index = -1) const; + int find(const TQChar &c, int index) const; + int find(const TQString &string, int index, bool cs) const; + int findRev(char c) const; TQChar at(uint i) const; TQString left(uint len) const; LIBCHMString mid(uint index, uint len = 0xffffffff) const; @@ -116,7 +116,7 @@ class LIBCHMDir class LIBCHMStringList { public: - static bool tqcontains(const TQStringList &list, const TQString &string); + static bool contains(const TQStringList &list, const TQString &string); static TQStringList split(const TQRegExp ®exp, const TQString &string); }; 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::iterator it = m_iconMap.tqfind (id); + TQMap::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::const_iterator it = m_urlListMap.tqfind( fixedstr ); + TQMap::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( "

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.

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 $q = new ChmFile();. This search also fully supports Unicode, which means that you can search in non-English documents.

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.") ); + i18n( "

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.

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 $q = new ChmFile();. This search also fully supports Unicode, which means that you can search in non-English documents.

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.") ); } 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() ) -- cgit v1.2.3