From b1833cf50dace47a755e575b1faa5372b7fb7d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 13 Jan 2019 15:27:30 +0100 Subject: [PATCH] Added controlled conversions to char* instead of automatic ascii conversions. The definition of -UTQT_NO_ASCII_CAST is no longer needed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 2 +- src/bookwidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf31ff6..7c70150 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST ) +add_definitions( -DHAVE_CONFIG_H ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/src/bookwidget.cpp b/src/bookwidget.cpp index c645524..7a23d70 100644 --- a/src/bookwidget.cpp +++ b/src/bookwidget.cpp @@ -83,7 +83,7 @@ void BookWidget::openURL(const KURL & url) m_stream.reset(new TQTextStream(&m_file)); m_textLines.reset(new TQStringList); TQString name(encoding()); - TQTextCodec *codec = TQTextCodec::codecForName(encoding()); // get the codec + TQTextCodec *codec = TQTextCodec::codecForName(encoding().latin1()); // get the codec if (codec) m_stream->setCodec(codec); //show progress dialog