mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-26 05:34: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

6
src/toolbar_gui.cpp
View File

@@ -2207,7 +2207,7 @@ static std::unique_ptr<NWidgetBase> MakeMainToolbar()
return hor;
}
static constexpr NWidgetPart _nested_toolbar_normal_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_toolbar_normal_widgets = {
NWidgetFunction(MakeMainToolbar),
};
@@ -2510,7 +2510,7 @@ struct ScenarioEditorToolbarWindow : Window {
}};
};
static constexpr NWidgetPart _nested_toolb_scen_inner_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_toolb_scen_inner_widgets = {
NWidget(WWT_IMGBTN, COLOUR_GREY, WID_TE_PAUSE), SetSpriteTip(SPR_IMG_PAUSE, STR_TOOLBAR_TOOLTIP_PAUSE_GAME),
NWidget(WWT_IMGBTN, COLOUR_GREY, WID_TE_FAST_FORWARD), SetSpriteTip(SPR_IMG_FASTFORWARD, STR_TOOLBAR_TOOLTIP_FORWARD),
NWidget(WWT_IMGBTN, COLOUR_GREY, WID_TE_SETTINGS), SetSpriteTip(SPR_IMG_SETTINGS, STR_TOOLBAR_TOOLTIP_OPTIONS),
@@ -2550,7 +2550,7 @@ static std::unique_ptr<NWidgetBase> MakeScenarioToolbar()
return MakeNWidgets(_nested_toolb_scen_inner_widgets, std::make_unique<NWidgetScenarioToolbarContainer>());
}
static constexpr NWidgetPart _nested_toolb_scen_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_toolb_scen_widgets = {
NWidgetFunction(MakeScenarioToolbar),
};