From 2a7cf2dd00e5106e8287239f9d4ac17287ecd84f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 9 Feb 2019 16:06:12 +0100 Subject: [PATCH] Added controlled conversions to char* instead of automatic ascii conversions. The definition of -UTQT_NO_ASCII_CAST is no longer needed. 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/menuhandler.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8698ff4..a5a6feb 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/src/menuhandler.cpp b/src/menuhandler.cpp index d3a4a79..2c4f29c 100644 --- a/src/menuhandler.cpp +++ b/src/menuhandler.cpp @@ -845,9 +845,9 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list TQString subText= TQString(); if( !isSeparator ) { - if( s->comment() != NULL && !s->comment().isEmpty() ) + if( !s->comment().isNull() && !s->comment().isEmpty() ) subText = s->comment(); - else if( s->genericName() && !s->genericName().isEmpty() ) + else if( !s->genericName().isNull() && !s->genericName().isEmpty() ) subText = s->genericName(); }