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 <slavek.banko@axis.cz>
(cherry picked from commit b1833cf50d)
r14.0.x
Slávek Banko 6 years ago
parent 9b62d9cd2b
commit 285ba72465
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -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" )

@ -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

Loading…
Cancel
Save