diff options
Diffstat (limited to 'lib/libchmfile')
| -rw-r--r-- | lib/libchmfile/libchmfile_search.cpp | 2 | ||||
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.cpp | 8 | ||||
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/libchmfile/libchmfile_search.cpp b/lib/libchmfile/libchmfile_search.cpp index 928a809..5f3be21 100644 --- a/lib/libchmfile/libchmfile_search.cpp +++ b/lib/libchmfile/libchmfile_search.cpp @@ -198,7 +198,7 @@ bool LCHMFile::searchQuery( const TQString& inquery, TQStringList * searchresult TQRegExp rxphrase( "\"(.*)\"" ); TQRegExp rxword( "([^\\s]+)" ); - rxphrase.setMinimal( TRUE ); + rxphrase.setMinimal( true ); // First, get the phrase queries while ( (pos = rxphrase.search (query, 0)) != -1 ) diff --git a/lib/libchmfile/libchmfileimpl.cpp b/lib/libchmfile/libchmfileimpl.cpp index 51bd7b4..63fc376 100644 --- a/lib/libchmfile/libchmfileimpl.cpp +++ b/lib/libchmfile/libchmfileimpl.cpp @@ -1032,18 +1032,18 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH TQString name_pattern = "name=", value_pattern = "value="; TQString pname, pvalue; - if ( (offset = tag.find (name_pattern, 0, FALSE)) == -1 ) + if ( (offset = tag.find (name_pattern, 0, false)) == -1 ) tqFatal ("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); + offset = findStringInQuotes (tag, offset + name_pattern.length(), pname, true, false); pname = pname.lower(); - if ( (offset = tag.find (value_pattern, offset, FALSE)) == -1 ) + if ( (offset = tag.find (value_pattern, offset, false)) == -1 ) tqFatal ("LCHMFileImpl::ParseAndFillTopicsTree: bad <param> tag '%s': no value=\n", tag.ascii()); // offset+6 skips 'value=' - findStringInQuotes (tag, offset + value_pattern.length(), pvalue, FALSE, TRUE); + findStringInQuotes (tag, offset + value_pattern.length(), pvalue, false, true); //tqDebug ("<param>: name '%s', value '%s'", pname.ascii(), pvalue.ascii()); diff --git a/lib/libchmfile/libchmfileimpl.h b/lib/libchmfile/libchmfileimpl.h index d596d81..4dd7f85 100644 --- a/lib/libchmfile/libchmfileimpl.h +++ b/lib/libchmfile/libchmfileimpl.h @@ -258,7 +258,7 @@ class LCHMFileImpl //! Map to decode HTML entitles like ´ based on current encoding TQMap<TQString, TQString> m_entityDecodeMap; - //! TRUE if /#TOPICS, /#STRINGS, /#URLTBL and /#URLSTR are resolved, and the members below are valid + //! true if /#TOPICS, /#STRINGS, /#URLTBL and /#URLSTR are resolved, and the members below are valid bool m_lookupTablesValid; //! pointer to /#TOPICS @@ -274,7 +274,7 @@ class LCHMFileImpl chmUnitInfo m_chmURLSTR; //! Indicates whether the built-in search is available. This is true only when m_lookupTablesValid - //! is TRUE, and m_chmFIftiMain is resolved. + //! is true, and m_chmFIftiMain is resolved. bool m_searchAvailable; //! pointer to /$FIftiMain |