Browse Source

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>
pull/1/head
Slávek Banko 4 months ago
parent
commit
2a7cf2dd00
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      CMakeLists.txt
  2. 2
    2
      src/menuhandler.cpp

+ 1
- 1
CMakeLists.txt View File

@@ -59,7 +59,7 @@ include( ConfigureChecks.cmake )
59 59
 
60 60
 ###### global compiler settings
61 61
 
62
-add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
62
+add_definitions( -DHAVE_CONFIG_H )
63 63
 
64 64
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
65 65
 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )

+ 2
- 2
src/menuhandler.cpp View File

@@ -845,9 +845,9 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list
845 845
         TQString subText= TQString();
846 846
         if( !isSeparator )
847 847
         {
848
-          if( s->comment() != NULL && !s->comment().isEmpty() )
848
+          if( !s->comment().isNull() && !s->comment().isEmpty() )
849 849
             subText = s->comment();
850
-          else if( s->genericName() && !s->genericName().isEmpty() )
850
+          else if( !s->genericName().isNull() && !s->genericName().isEmpty() )
851 851
             subText = s->genericName();
852 852
         }
853 853
 

Loading…
Cancel
Save