diff options
Diffstat (limited to 'lib/libchmfile/libchmfileimpl.cpp')
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
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<TQString, TQString>::const_iterator it = m_entityDecodeMap.tqfind( entity ); + TQMap<TQString, TQString>::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 <param> 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 <param> 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()); // <OBJECT type="text/sitemap"> - 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 <param> 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 <param> 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(); |