From 46b504a70047c1b6370cb227b46130a25dd7644f Mon Sep 17 00:00:00 2001 From: glx22 Date: Thu, 13 Jul 2023 17:41:06 +0200 Subject: [PATCH] Fix: ini_key issues reported by the script --- src/airport_gui.cpp | 2 +- src/company_gui.cpp | 4 ++-- src/engine_gui.cpp | 2 +- src/error_gui.cpp | 4 ++-- src/league_gui.cpp | 4 ++-- src/misc_gui.cpp | 4 ++-- src/music_gui.cpp | 2 +- src/osk_gui.cpp | 2 +- src/rail_gui.cpp | 2 +- src/settings_gui.cpp | 2 +- src/signs_gui.cpp | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index 76dff44336..fe0e6f7f39 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -619,7 +619,7 @@ static const NWidgetPart _nested_build_airport_widgets[] = { }; static WindowDesc _build_airport_desc( - WDP_AUTO, "build_station_air", 0, 0, + WDP_AUTO, nullptr, 0, 0, WC_BUILD_STATION, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_build_airport_widgets, lengthof(_nested_build_airport_widgets) diff --git a/src/company_gui.cpp b/src/company_gui.cpp index f25b6654cb..37861ae337 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -1157,7 +1157,7 @@ static const NWidgetPart _nested_select_company_livery_widgets [] = { }; static WindowDesc _select_company_livery_desc( - WDP_AUTO, "company_livery", 0, 0, + WDP_AUTO, nullptr, 0, 0, WC_COMPANY_COLOUR, WC_NONE, 0, _nested_select_company_livery_widgets, lengthof(_nested_select_company_livery_widgets) @@ -1774,7 +1774,7 @@ public: /** Company manager face selection window description */ static WindowDesc _select_company_manager_face_desc( - WDP_AUTO, "company_face", 0, 0, + WDP_AUTO, nullptr, 0, 0, WC_COMPANY_MANAGER_FACE, WC_NONE, WDF_CONSTRUCTION, _nested_select_company_manager_face_widgets, lengthof(_nested_select_company_manager_face_widgets) diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp index 3c995d9fa6..e15ad40828 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -144,7 +144,7 @@ struct EnginePreviewWindow : Window { }; static WindowDesc _engine_preview_desc( - WDP_CENTER, "engine_preview", 0, 0, + WDP_CENTER, nullptr, 0, 0, WC_ENGINE_PREVIEW, WC_NONE, WDF_CONSTRUCTION, _nested_engine_preview_widgets, lengthof(_nested_engine_preview_widgets) diff --git a/src/error_gui.cpp b/src/error_gui.cpp index 39809797a0..40b693bd75 100644 --- a/src/error_gui.cpp +++ b/src/error_gui.cpp @@ -43,7 +43,7 @@ static const NWidgetPart _nested_errmsg_widgets[] = { }; static WindowDesc _errmsg_desc( - WDP_MANUAL, "error", 0, 0, + WDP_MANUAL, nullptr, 0, 0, WC_ERRMSG, WC_NONE, 0, _nested_errmsg_widgets, lengthof(_nested_errmsg_widgets) @@ -63,7 +63,7 @@ static const NWidgetPart _nested_errmsg_face_widgets[] = { }; static WindowDesc _errmsg_face_desc( - WDP_MANUAL, "error_face", 0, 0, + WDP_MANUAL, nullptr, 0, 0, WC_ERRMSG, WC_NONE, 0, _nested_errmsg_face_widgets, lengthof(_nested_errmsg_face_widgets) diff --git a/src/league_gui.cpp b/src/league_gui.cpp index ec1e828178..7a0b2c9b3b 100644 --- a/src/league_gui.cpp +++ b/src/league_gui.cpp @@ -197,7 +197,7 @@ static const NWidgetPart _nested_performance_league_widgets[] = { }; static WindowDesc _performance_league_desc( - WDP_AUTO, "league", 0, 0, + WDP_AUTO, "performance_league", 0, 0, WC_COMPANY_LEAGUE, WC_NONE, 0, _nested_performance_league_widgets, lengthof(_nested_performance_league_widgets) @@ -429,7 +429,7 @@ static const NWidgetPart _nested_script_league_widgets[] = { }; static WindowDesc _script_league_desc( - WDP_AUTO, "league", 0, 0, + WDP_AUTO, "script_league", 0, 0, WC_COMPANY_LEAGUE, WC_NONE, 0, _nested_script_league_widgets, lengthof(_nested_script_league_widgets) diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 6cfc1876bb..5806efbcb5 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -59,7 +59,7 @@ static const NWidgetPart _nested_land_info_widgets[] = { }; static WindowDesc _land_info_desc( - WDP_AUTO, "land_info", 0, 0, + WDP_AUTO, nullptr, 0, 0, WC_LAND_INFO, WC_NONE, 0, _nested_land_info_widgets, lengthof(_nested_land_info_widgets) @@ -1064,7 +1064,7 @@ static const NWidgetPart _nested_query_string_widgets[] = { }; static WindowDesc _query_string_desc( - WDP_CENTER, "query_string", 0, 0, + WDP_CENTER, nullptr, 0, 0, WC_QUERY_STRING, WC_NONE, 0, _nested_query_string_widgets, lengthof(_nested_query_string_widgets) diff --git a/src/music_gui.cpp b/src/music_gui.cpp index b995776f4b..8cff204162 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -642,7 +642,7 @@ static const NWidgetPart _nested_music_track_selection_widgets[] = { }; static WindowDesc _music_track_selection_desc( - WDP_AUTO, "music_track", 0, 0, + WDP_AUTO, nullptr, 0, 0, WC_MUSIC_TRACK_SELECTION, WC_NONE, 0, _nested_music_track_selection_widgets, lengthof(_nested_music_track_selection_widgets) diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index 750838acd6..ebffc51c52 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -335,7 +335,7 @@ static const NWidgetPart _nested_osk_widgets[] = { }; static WindowDesc _osk_desc( - WDP_CENTER, "query_osk", 0, 0, + WDP_CENTER, nullptr, 0, 0, WC_OSK, WC_NONE, 0, _nested_osk_widgets, lengthof(_nested_osk_widgets) diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index a784cd1fe6..b1f451ef3e 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1886,7 +1886,7 @@ static const NWidgetPart _nested_signal_builder_widgets[] = { /** Signal selection window description */ static WindowDesc _signal_builder_desc( - WDP_AUTO, "build_signal", 0, 0, + WDP_AUTO, nullptr, 0, 0, WC_BUILD_SIGNAL, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_signal_builder_widgets, lengthof(_nested_signal_builder_widgets) diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 1ece5c0be8..341926acdc 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -899,7 +899,7 @@ static const NWidgetPart _nested_game_options_widgets[] = { }; static WindowDesc _game_options_desc( - WDP_CENTER, "settings_game", 0, 0, + WDP_CENTER, nullptr, 0, 0, WC_GAME_OPTIONS, WC_NONE, 0, _nested_game_options_widgets, lengthof(_nested_game_options_widgets) diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp index a2a1c0b8d8..a9d29ab3b2 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -552,7 +552,7 @@ static const NWidgetPart _nested_query_sign_edit_widgets[] = { }; static WindowDesc _query_sign_edit_desc( - WDP_CENTER, "query_sign", 0, 0, + WDP_CENTER, nullptr, 0, 0, WC_QUERY_STRING, WC_NONE, WDF_CONSTRUCTION, _nested_query_sign_edit_widgets, lengthof(_nested_query_sign_edit_widgets)