mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-20 02:42:42 +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

10
src/misc_gui.cpp
View File

@@ -47,7 +47,7 @@ enum OskActivation : uint8_t {
};
static constexpr NWidgetPart _nested_land_info_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_land_info_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY), SetStringTip(STR_LAND_AREA_INFORMATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -319,7 +319,7 @@ void ShowLandInfo(TileIndex tile)
new LandInfoWindow(tile);
}
static constexpr NWidgetPart _nested_about_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_about_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY), SetStringTip(STR_ABOUT_OPENTTD, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -586,7 +586,7 @@ void HideFillingPercent(TextEffectID *te_id)
*te_id = INVALID_TE_ID;
}
static constexpr NWidgetPart _nested_tooltips_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_tooltips_widgets = {
NWidget(WWT_EMPTY, INVALID_COLOUR, WID_TT_BACKGROUND),
};
@@ -975,7 +975,7 @@ struct QueryStringWindow : public Window
}
};
static constexpr NWidgetPart _nested_query_string_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_query_string_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_QS_CAPTION), SetTextStyle(TC_WHITE),
@@ -1113,7 +1113,7 @@ struct QueryWindow : public Window {
}
};
static constexpr NWidgetPart _nested_query_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_query_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_RED),
NWidget(WWT_CAPTION, COLOUR_RED, WID_Q_CAPTION),