Inappropriately used TQString::fromUtf8() moved to place where it is needed.

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 f39f545444)
r14.0.x
Slávek Banko 6 years ago
parent 62a9253d76
commit b736cc351a
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

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

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

Loading…
Cancel
Save