diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2020-08-05 18:25:38 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2020-08-07 15:31:04 +0200 |
commit | 450fd249dd5cce5efc21f49ba1d3e5741d527750 (patch) | |
tree | 76517ce76d01c3fddb8abd744ec7427748c2bbab | |
parent | 0b3b22a0445d41f6165b583b97e021001356a7cf (diff) | |
download | tde-systemsettings-450fd249dd5cce5efc21f49ba1d3e5741d527750.tar.gz tde-systemsettings-450fd249dd5cce5efc21f49ba1d3e5741d527750.zip |
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>
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | systemsettings/mainwindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b759ecc..c1cebb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,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/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp index 2886def..082a7be 100644 --- a/systemsettings/mainwindow.cpp +++ b/systemsettings/mainwindow.cpp @@ -175,7 +175,7 @@ void MainWindow::buildActions() } TDERadioAction *newAction = new TDERadioAction( group->caption(), group->icon(), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT(slotTopPage()), actionCollection(), group->relPath() ); + TQT_SLOT(slotTopPage()), actionCollection(), group->relPath().utf8() ); pageActions.append(newAction); kdDebug() << "relpath is :" << group->relPath() << endl; } |