From 591c8f8d77f742dd99e59dab537dd9d5a62e88a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 6 Dec 2021 16:14:32 +0100 Subject: 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 +- qt/PlatQt.cpp | 2 +- qt/qextscintillalexerpython.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea0899c..ec0bdfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,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/qt/PlatQt.cpp b/qt/PlatQt.cpp index 4029f43..0f46659 100644 --- a/qt/PlatQt.cpp +++ b/qt/PlatQt.cpp @@ -819,7 +819,7 @@ ColourDesired Platform::ChromeHighlight() const char *Platform::DefaultFont() { - return TQApplication::font().family(); + return TQApplication::font().family().utf8(); } int Platform::DefaultFontSize() diff --git a/qt/qextscintillalexerpython.cpp b/qt/qextscintillalexerpython.cpp index ce53537..c9688e3 100644 --- a/qt/qextscintillalexerpython.cpp +++ b/qt/qextscintillalexerpython.cpp @@ -406,7 +406,7 @@ void QextScintillaLexerPython::setIndentationWarning(IndentationWarning warn) // Set the "tab.timmy.whinge.level" property. void QextScintillaLexerPython::setTabWhingeProp() { - emit propertyChanged("tab.timmy.whinge.level",TQString::number(indent_warn)); + emit propertyChanged("tab.timmy.whinge.level",TQString::number(indent_warn).latin1()); } #include "qextscintillalexerpython.moc" -- cgit v1.2.1