miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Pass NWidgetParts as span instead of begin/end pointers. (#12779)

Browse Source
This commit is contained in:
Peter Nelson
2024-06-12 23:08:35 +01:00
committed by GitHub
parent 81b5a7c7c6
commit 55314513ce
67 changed files with 201 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/toolbar_gui.cpp
+3 -3
View File
@@ -2210,7 +2210,7 @@ static WindowDesc _toolb_normal_desc(
WDP_MANUAL, nullptr, 0, 0,
WC_MAIN_TOOLBAR, WC_NONE,
WDF_NO_FOCUS | WDF_NO_CLOSE,
std::begin(_nested_toolbar_normal_widgets), std::end(_nested_toolbar_normal_widgets),
_nested_toolbar_normal_widgets,
&MainToolbarWindow::hotkeys
);
@@ -2539,7 +2539,7 @@ static constexpr NWidgetPart _nested_toolb_scen_inner_widgets[] = {
static std::unique_ptr<NWidgetBase> MakeScenarioToolbar()
{
return MakeNWidgets(std::begin(_nested_toolb_scen_inner_widgets), std::end(_nested_toolb_scen_inner_widgets), std::make_unique<NWidgetScenarioToolbarContainer>());
return MakeNWidgets(_nested_toolb_scen_inner_widgets, std::make_unique<NWidgetScenarioToolbarContainer>());
}
static constexpr NWidgetPart _nested_toolb_scen_widgets[] = {
@@ -2550,7 +2550,7 @@ static WindowDesc _toolb_scen_desc(
WDP_MANUAL, nullptr, 0, 0,
WC_MAIN_TOOLBAR, WC_NONE,
WDF_NO_FOCUS | WDF_NO_CLOSE,
std::begin(_nested_toolb_scen_widgets), std::end(_nested_toolb_scen_widgets),
_nested_toolb_scen_widgets,
&ScenarioEditorToolbarWindow::hotkeys
);