diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2019-03-02 16:03:48 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2019-03-02 16:04:26 +0100 |
commit | db37455b62d2357741dce5fd099eba4c5ebac0de (patch) | |
tree | 8aa07454e88aeaa81c19fe8ef02400a6d42fa067 | |
parent | 7e4b17f262de7fb3610c323803316d88532ed539 (diff) | |
download | kooldock-db37455b62d2357741dce5fd099eba4c5ebac0de.tar.gz kooldock-db37455b62d2357741dce5fd099eba4c5ebac0de.zip |
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.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | 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("<center><B>Welcome</B></center>It appears to be the first time you run KoolDock.<br>" + const char* welcomeMsg = + I18N_NOOP("<center><B>Welcome</B></center>It appears to be the first time you run KoolDock.<br>" "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.<br>" "Right click on the dock for a menu that allows you to configure it<br>" |