Browse Source

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>
pull/1/head
Slávek Banko 6 months ago
parent
commit
b1833cf50d
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      CMakeLists.txt
  2. 1
    1
      src/bookwidget.cpp

+ 1
- 1
CMakeLists.txt View File

@@ -58,7 +58,7 @@ include( ConfigureChecks.cmake )
58 58
 
59 59
 ###### global compiler settings
60 60
 
61
-add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
61
+add_definitions( -DHAVE_CONFIG_H )
62 62
 
63 63
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
64 64
 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )

+ 1
- 1
src/bookwidget.cpp View File

@@ -83,7 +83,7 @@ void BookWidget::openURL(const KURL & url)
83 83
 	m_stream.reset(new TQTextStream(&m_file));
84 84
 	m_textLines.reset(new TQStringList);
85 85
 	TQString name(encoding());
86
-	TQTextCodec *codec = TQTextCodec::codecForName(encoding()); // get the codec
86
+	TQTextCodec *codec = TQTextCodec::codecForName(encoding().latin1()); // get the codec
87 87
 	if (codec)
88 88
  		m_stream->setCodec(codec);
89 89
 	//show progress dialog

Loading…
Cancel
Save