Remove -Wno-reorder

[xonotic/netradiant.git] / radiant / help.cpp

diff --git a/radiant/help.cpp b/radiant/help.cpp
index d5319f30c0469575d9091c8baa81e483b56c7914..82e5f6671d3866d2e6b975687e4d5594fb5b6048 100644 (file)
--- a/radiant/help.cpp
+++ b/radiant/help.cpp
@@ -51,13 +51,13 @@ void HandleHelpCommand( CopiedString& str ){
        OpenURL( str.c_str() );
 }
 
-void process_xlink( const char* filename, const char *menu_name, const char *base_url, GtkMenu *menu ){
+void process_xlink( const char* filename, const char *menu_name, const char *base_url, ui::Menu menu ){
        if ( file_exists( filename ) ) {
                xmlDocPtr pDoc = xmlParseFile( filename );
                if ( pDoc ) {
                        globalOutputStream() << "Processing .xlink file '" << filename << "'\n";
                        // create sub menu
-                       GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic( menu, menu_name );
+                       auto menu_in_menu = create_sub_menu_with_mnemonic( menu, menu_name );
                        if ( g_Layout_enableDetachableMenus.m_value ) {
                                menu_tearoff( menu_in_menu );
                        }
@@ -75,7 +75,8 @@ void process_xlink( const char* filename, const char *menu_name, const char *bas
 
                                                xmlChar* prop = xmlGetProp( pNode, reinterpret_cast<const xmlChar*>( "url" ) );
                                                ASSERT_NOTNULL( prop );
-                                               if ( strstr( reinterpret_cast<const char*>( prop ), "http://" ) ) {
+                                               if ( strstr( reinterpret_cast<const char*>( prop ), "http://" ) ||
+                                                       strstr( reinterpret_cast<const char*>( prop ), "https://" ) ) {
                                                        // complete URL
                                                        url = reinterpret_cast<const char*>( prop );
                                                }
@@ -112,7 +113,7 @@ void process_xlink( const char* filename, const char *menu_name, const char *bas
        }
 }
 
-void create_game_help_menu( GtkMenu *menu ){
+void create_game_help_menu( ui::Menu menu ){
        StringOutputStream filename( 256 );
        filename << AppPath_get() << "global.xlink";
        process_xlink( filename.c_str(), "General", AppPath_get(), menu );