diff options
Diffstat (limited to 'lib/libchmfile/libchmfileimpl.h')
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/libchmfile/libchmfileimpl.h b/lib/libchmfile/libchmfileimpl.h index c6558f7..4dd7f85 100644 --- a/lib/libchmfile/libchmfileimpl.h +++ b/lib/libchmfile/libchmfileimpl.h @@ -19,9 +19,11 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - +#if USE_BUILTIN_CHMLIB #include "chm_lib.h" - +#else +#include <chm_lib.h> +#endif #include "libchmfile.h" #include "libchmtocimage.h" @@ -107,7 +109,7 @@ class LCHMFileImpl //! Encode the string with the currently selected text codec, if possible. Or return as-is, if not. inline TQString encodeWithCurrentCodec (const TQString& str) const { - return (m_textCodec ? m_textCodec->toUnicode (str) : str); + return (m_textCodec ? m_textCodec->toUnicode (str.utf8()) : str); } //! Encode the string with the currently selected text codec, if possible. Or return as-is, if not. @@ -120,7 +122,7 @@ class LCHMFileImpl //! Or return as-is, if not. inline TQString encodeInternalWithCurrentCodec (const TQString& str) const { - return (m_textCodecForSpecialFiles ? m_textCodecForSpecialFiles->toUnicode (str) : str); + return (m_textCodecForSpecialFiles ? m_textCodecForSpecialFiles->toUnicode (str.utf8()) : str); } //! Encode the string from internal files with the currently selected text codec, if possible. @@ -256,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 @@ -272,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 |