mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-23 20:24:12 +01:00
Code Issues Releases Wiki Activity

Codechange: Use std::initializer_list for NWidgetPart data. (#14749)

Browse Source 
Avoids using C/C++ arrays.
This commit is contained in:
Peter Nelson
2025-11-01 22:33:00 +00:00
committed by GitHub
parent 34bbae05db
commit 66b6d71e32
62 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/network_gui.cpp
View File

@@ -854,7 +854,7 @@ static std::unique_ptr<NWidgetBase> MakeResizableHeader()
return std::make_unique<NWidgetServerListHeader>();
}
static constexpr NWidgetPart _nested_network_game_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_network_game_widgets = {
/* TOP */
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE),
@@ -1129,7 +1129,7 @@ struct NetworkStartServerWindow : public Window {
}
};
static constexpr NWidgetPart _nested_network_start_server_window_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_network_start_server_window_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE),
NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE), SetStringTip(STR_NETWORK_START_SERVER_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -1217,7 +1217,7 @@ static void ShowNetworkStartServerWindow()
extern void DrawCompanyIcon(CompanyID cid, int x, int y);
static constexpr NWidgetPart _nested_client_list_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_client_list_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY), SetStringTip(STR_NETWORK_CLIENT_LIST_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -2097,7 +2097,7 @@ struct NetworkJoinStatusWindow : Window {
}
};
static constexpr NWidgetPart _nested_network_join_status_window_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_network_join_status_window_widgets = {
NWidget(WWT_CAPTION, COLOUR_GREY), SetStringTip(STR_NETWORK_CONNECTING_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_PANEL, COLOUR_GREY),
NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.modalpopup),
@@ -2198,7 +2198,7 @@ struct NetworkAskRelayWindow : public Window {
}
};
static constexpr NWidgetPart _nested_network_ask_relay_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_network_ask_relay_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_RED),
NWidget(WWT_CAPTION, COLOUR_RED, WID_NAR_CAPTION), SetStringTip(STR_NETWORK_ASK_RELAY_CAPTION),
@@ -2293,7 +2293,7 @@ struct NetworkAskSurveyWindow : public Window {
}
};
static constexpr NWidgetPart _nested_network_ask_survey_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_network_ask_survey_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_NAS_CAPTION), SetStringTip(STR_NETWORK_ASK_SURVEY_CAPTION),