diff options
| author | Slávek Banko <[email protected]> | 2019-05-11 17:41:22 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2019-05-12 17:38:30 +0200 |
| commit | 518045aebbfa9cf4cd1f9f4b36d5003f2414795e (patch) | |
| tree | a4f0888ef3228dab49d298b0bd1f19e0001382dd /lib/libchmfile/libchmfileimpl.cpp | |
| parent | 87aa164bb841a8ffe4f418f14f861b16a6780003 (diff) | |
| download | kchmviewer-518045aebbfa9cf4cd1f9f4b36d5003f2414795e.tar.gz kchmviewer-518045aebbfa9cf4cd1f9f4b36d5003f2414795e.zip | |
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit c0263d89c688f750a6e68a7f77257b2be0c55990)
Diffstat (limited to 'lib/libchmfile/libchmfileimpl.cpp')
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libchmfile/libchmfileimpl.cpp b/lib/libchmfile/libchmfileimpl.cpp index a5ad04c..51bd7b4 100644 --- a/lib/libchmfile/libchmfileimpl.cpp +++ b/lib/libchmfile/libchmfileimpl.cpp @@ -864,7 +864,7 @@ TQCString LCHMFileImpl::convertSearchWord( const TQString & src ) }; if ( !m_textCodec ) - return (TQCString) src.lower(); + return src.lower().utf8(); TQCString dest = m_textCodec->fromUnicode (src); @@ -996,7 +996,7 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH else if ( tagword == "/object" && in_object ) { // a topic entry closed. Add a tree item - if ( entry.name ) + if ( !entry.name.isEmpty() ) { if ( !root_indent_offset_set ) { |