summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-11-04 02:23:25 +0100
committerSlávek Banko <slavek.banko@axis.cz>2018-11-04 02:23:25 +0100
commit64c09a0ec1110811841883ae7260c7df447e022c (patch)
treeee1125f175e39e2544cd84491addc370859050d7
parentec807a6bae192e677cefa55c906b5c7bcecc2960 (diff)
downloadksplash-engine-moodin-64c09a0ec1110811841883ae7260c7df447e022c.tar.gz
ksplash-engine-moodin-64c09a0ec1110811841883ae7260c7df447e022c.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.txt2
-rw-r--r--src/magiclabel.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 426a862..4df15b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,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/magiclabel.cpp b/src/magiclabel.cpp
index 0613720..b22461d 100644
--- a/src/magiclabel.cpp
+++ b/src/magiclabel.cpp
@@ -31,7 +31,7 @@ MagicLabel::MagicLabel(TQString s, bool translate)
transform();
if (translate)
- mValue = i18n(mValue);
+ mValue = i18n(mValue.utf8());
}