From db37455b62d2357741dce5fd099eba4c5ebac0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 2 Mar 2019 16:03:48 +0100 Subject: [PATCH] Change welcomeMsg from TQString to const char* and use I18N_NOOP. This resolves FTBFS with TQT_NO_ASCII_CAST and ensure that the string will be added to the translation template. 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/kooldock.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f5f02c..20b1b7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,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/kooldock.cpp b/src/kooldock.cpp index d951163..6c2e8cb 100644 --- a/src/kooldock.cpp +++ b/src/kooldock.cpp @@ -106,7 +106,8 @@ KoolDock::KoolDock(TQWidget* parent, const char* name) : if (fFirstRun) { // Show welcome dialog. - TQString welcomeMsg("
Welcome
It appears to be the first time you run KoolDock.
" + const char* welcomeMsg = + I18N_NOOP("
Welcome
It appears to be the first time you run KoolDock.
" "By default the dock is hidden at the botton of the screen, move your mouse" " to the bottom edge of the screen and the dock will appear.
" "Right click on the dock for a menu that allows you to configure it
"