From f39f545444a1c3b4c315029fbedb118d24010dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 28 Sep 2018 20:48:57 +0200 Subject: [PATCH] Inappropriately used TQString::fromUtf8() moved to place where it is needed. 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/MainWidget.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6787bb1..04e4083 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,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 "-Wl,--no-undefined" ) diff --git a/src/MainWidget.cpp b/src/MainWidget.cpp index 75afa2d..4008f49 100644 --- a/src/MainWidget.cpp +++ b/src/MainWidget.cpp @@ -398,10 +398,10 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const setFocusPolicy ( TQ_NoFocus ); - - int padx= 550; - TQString txt[9] = {"Ho\nme","▲","Pg\nUp","◄"," ","►","End","▼","Pg\nDn"}; + TQString txt[9] = { "Ho\nme", TQString::fromUtf8("▲"), "Pg\nUp", + TQString::fromUtf8("◄"), " ", TQString::fromUtf8("►"), + "End", TQString::fromUtf8("▼"), "Pg\nDn" }; TQString nump[9] = {"7","8","9","4","5","6","1","2","3"}; int val=0; int nval[9] = {16,17,18,13,14,15,10,11,12}; @@ -412,8 +412,8 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const v->move(padx+(b*35),sty+(a*35)); v->res(); v->setKeyCode(nval[val],cval[val]); - v->setText(TQString::fromUtf8(txt[val])); - v->setShiftText(TQString::fromUtf8(nump[val])); + v->setText(txt[val]); + v->setShiftText(nump[val]); numl_keys.append(v); connect ( v, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); val++;