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>

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" )

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();
         }