cpp/openttd-patchpack/source Changeset - r27724:fe6470f73b2e

Changeset - r27724:fe6470f73b2e

Parent rev.

Child rev.

[Not reviewed]

master

0 11 0

glx22 - 17 months ago 2023-07-13 15:41:06
glx@openttd.org

Fix: ini_key issues reported by the script

11 files changed with 15 insertions and 15 deletions:

src/airport_gui.cpp

src/company_gui.cpp

src/engine_gui.cpp

src/error_gui.cpp

src/league_gui.cpp

src/misc_gui.cpp

src/music_gui.cpp

src/osk_gui.cpp

src/rail_gui.cpp

src/settings_gui.cpp

src/signs_gui.cpp

0 comments (0 inline, 0 general)

src/airport_gui.cpp

➞

Show inline comments

@@ @@ -616,13 +616,13 @@ static const NWidgetPart _nested_build_a @@
 		EndContainer(),
 		NWidget(WWT_EMPTY, COLOUR_DARK_GREEN, WID_AP_ACCEPTANCE), SetPadding(WidgetDimensions::unscaled.framerect), SetResize(0, 1), SetFill(1, 0),
 	EndContainer(),
 };
 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)
 );
 static void ShowBuildAirportPicker(Window *parent)

src/company_gui.cpp

➞

Show inline comments

@@ @@ -1154,13 +1154,13 @@ static const NWidgetPart _nested_select_ @@
 			NWidget(WWT_RESIZEBOX, COLOUR_GREY),
 		EndContainer(),
 	EndContainer(),
 };
 static WindowDesc _select_company_livery_desc(
-	WDP_AUTO, "company_livery", 0, 0,
+	WDP_AUTO, nullptr, 0, 0,
 	WC_COMPANY_COLOUR, WC_NONE,
 ,
 	_nested_select_company_livery_widgets, lengthof(_nested_select_company_livery_widgets)
 );
 void ShowCompanyLiveryWindow(CompanyID company, GroupID group)
@@ @@ -1771,13 +1771,13 @@ 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)
 );
 /**

src/engine_gui.cpp

➞

Show inline comments

@@ @@ -141,13 +141,13 @@ struct EnginePreviewWindow : Window { @@
 		EngineID engine = this->window_number;
 		if (Engine::Get(engine)->preview_company != _local_company) this->Close();
+	}
 };
 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)
 );

src/error_gui.cpp

➞

Show inline comments

@@ @@ -40,13 +40,13 @@ static const NWidgetPart _nested_errmsg_ @@
 	NWidget(WWT_PANEL, COLOUR_RED),
 		NWidget(WWT_EMPTY, COLOUR_RED, WID_EM_MESSAGE), SetPadding(WidgetDimensions::unscaled.modalpopup), SetFill(1, 0), SetMinimalSize(236, 0),
 	EndContainer(),
 };
 static WindowDesc _errmsg_desc(
-	WDP_MANUAL, "error", 0, 0,
+	WDP_MANUAL, nullptr, 0, 0,
 	WC_ERRMSG, WC_NONE,
 ,
 	_nested_errmsg_widgets, lengthof(_nested_errmsg_widgets)
 );
 static const NWidgetPart _nested_errmsg_face_widgets[] = {
@@ @@ -60,13 +60,13 @@ static const NWidgetPart _nested_errmsg_ @@
 			NWidget(WWT_EMPTY, COLOUR_RED, WID_EM_MESSAGE), SetPadding(WidgetDimensions::unscaled.modalpopup), SetFill(1, 1), SetMinimalSize(236, 0),
 		EndContainer(),
 	EndContainer(),
 };
 static WindowDesc _errmsg_face_desc(
-	WDP_MANUAL, "error_face", 0, 0,
+	WDP_MANUAL, nullptr, 0, 0,
 	WC_ERRMSG, WC_NONE,
 ,
 	_nested_errmsg_face_widgets, lengthof(_nested_errmsg_face_widgets)
 );
 /**

src/league_gui.cpp

➞

Show inline comments

@@ @@ -194,13 +194,13 @@ static const NWidgetPart _nested_perform @@
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_PLT_BACKGROUND), SetMinimalSize(400, 0), SetMinimalTextLines(15, WidgetDimensions::unscaled.framerect.Vertical()),
 };
 static WindowDesc _performance_league_desc(
-	WDP_AUTO, "league", 0, 0,
+	WDP_AUTO, "performance_league", 0, 0,
 	WC_COMPANY_LEAGUE, WC_NONE,
 ,
 	_nested_performance_league_widgets, lengthof(_nested_performance_league_widgets)
 );
 void ShowPerformanceLeagueTable()
@@ @@ -426,13 +426,13 @@ static const NWidgetPart _nested_script_ @@
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_SLT_BACKGROUND), SetMinimalSize(400, 0), SetMinimalTextLines(15, WidgetDimensions::scaled.framerect.Vertical()),
 };
 static WindowDesc _script_league_desc(
-	WDP_AUTO, "league", 0, 0,
+	WDP_AUTO, "script_league", 0, 0,
 	WC_COMPANY_LEAGUE, WC_NONE,
 ,
 	_nested_script_league_widgets, lengthof(_nested_script_league_widgets)
 );
 void ShowScriptLeagueTable(LeagueTableID table)

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ static const NWidgetPart _nested_land_in @@
 		NWidget(WWT_DEBUGBOX, COLOUR_GREY),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, WID_LI_BACKGROUND), EndContainer(),
 };
 static WindowDesc _land_info_desc(
-	WDP_AUTO, "land_info", 0, 0,
+	WDP_AUTO, nullptr, 0, 0,
 	WC_LAND_INFO, WC_NONE,
 ,
 	_nested_land_info_widgets, lengthof(_nested_land_info_widgets)
 );
 class LandInfoWindow : public Window {
@@ @@ -1061,13 +1061,13 @@ static const NWidgetPart _nested_query_s @@
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_CANCEL), SetMinimalSize(86, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_OK), SetMinimalSize(87, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_OK, STR_NULL),
 	EndContainer(),
 };
 static WindowDesc _query_string_desc(
-	WDP_CENTER, "query_string", 0, 0,
+	WDP_CENTER, nullptr, 0, 0,
 	WC_QUERY_STRING, WC_NONE,
 ,
 	_nested_query_string_widgets, lengthof(_nested_query_string_widgets)
 );
 /**

src/music_gui.cpp

➞

Show inline comments

@@ @@ -639,13 +639,13 @@ static const NWidgetPart _nested_music_t @@
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),
 };
 static WindowDesc _music_track_selection_desc(
-	WDP_AUTO, "music_track", 0, 0,
+	WDP_AUTO, nullptr, 0, 0,
 	WC_MUSIC_TRACK_SELECTION, WC_NONE,
 ,
 	_nested_music_track_selection_widgets, lengthof(_nested_music_track_selection_widgets)
 );
 static void ShowMusicTrackSelection()

src/osk_gui.cpp

➞

Show inline comments

@@ @@ -332,13 +332,13 @@ static const NWidgetPart _nested_osk_wid @@
 		NWidgetFunction(MakeZxcvbKeys), SetPadding(0, 3, 0, 3),
 		NWidgetFunction(MakeSpacebarKeys), SetPadding(0, 3, 0, 3),
 	EndContainer(),
 };
 static WindowDesc _osk_desc(
-	WDP_CENTER, "query_osk", 0, 0,
+	WDP_CENTER, nullptr, 0, 0,
 	WC_OSK, WC_NONE,
 ,
 	_nested_osk_widgets, lengthof(_nested_osk_widgets)
 );
 /**

src/rail_gui.cpp

➞

Show inline comments

@@ @@ -1883,13 +1883,13 @@ static const NWidgetPart _nested_signal_ @@
 		EndContainer(),
 	EndContainer(),
 };
 /** 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)
 );
 /**

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -896,13 +896,13 @@ static const NWidgetPart _nested_game_op @@
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),
 };
 static WindowDesc _game_options_desc(
-	WDP_CENTER, "settings_game", 0, 0,
+	WDP_CENTER, nullptr, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 ,
 	_nested_game_options_widgets, lengthof(_nested_game_options_widgets)
 );
 /** Open the game options window. */

src/signs_gui.cpp

➞

Show inline comments

@@ @@ -549,13 +549,13 @@ static const NWidgetPart _nested_query_s @@
 		NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_QES_PREVIOUS), SetMinimalSize(11, 12), SetDataTip(AWV_DECREASE, STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP),
 		NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_QES_NEXT), SetMinimalSize(11, 12), SetDataTip(AWV_INCREASE, STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP),
 	EndContainer(),
 };
 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)
 );
 /**

0 comments (0 inline, 0 general)