dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Make all NWidgetPart arrays constexpr.

Browse Source 
This ensures that the arrays are not created at runtime and prevents using non-constexpr values.
This commit is contained in:
Peter Nelson
2024-01-15 22:49:24 +00:00
committed by Peter Nelson
parent 71b7ba0daa
commit 7737aa6640
61 changed files with 154 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/network_gui.cpp
View File

@@ -871,7 +871,7 @@ static std::unique_ptr<NWidgetBase> MakeResizableHeader()
return std::make_unique<NWidgetServerListHeader>();
}
static const NWidgetPart _nested_network_game_widgets[] = {
static constexpr NWidgetPart _nested_network_game_widgets[] = {
/* TOP */
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE),
@@ -1149,7 +1149,7 @@ struct NetworkStartServerWindow : public Window {
}
};
static const NWidgetPart _nested_network_start_server_window_widgets[] = {
static constexpr NWidgetPart _nested_network_start_server_window_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE),
NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE), SetDataTip(STR_NETWORK_START_SERVER_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -1237,7 +1237,7 @@ static void ShowNetworkStartServerWindow()
extern void DrawCompanyIcon(CompanyID cid, int x, int y);
static const NWidgetPart _nested_client_list_widgets[] = {
static constexpr NWidgetPart _nested_client_list_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_NETWORK_CLIENT_LIST_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -2194,7 +2194,7 @@ struct NetworkJoinStatusWindow : Window {
}
};
static const NWidgetPart _nested_network_join_status_window_widgets[] = {
static constexpr NWidgetPart _nested_network_join_status_window_widgets[] = {
NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(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),
@@ -2302,7 +2302,7 @@ struct NetworkCompanyPasswordWindow : public Window {
}
};
static const NWidgetPart _nested_network_company_password_window_widgets[] = {
static constexpr NWidgetPart _nested_network_company_password_window_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_COMPANY_PASSWORD_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -2419,7 +2419,7 @@ struct NetworkAskRelayWindow : public Window {
}
};
static const NWidgetPart _nested_network_ask_relay_widgets[] = {
static constexpr NWidgetPart _nested_network_ask_relay_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_RED),
NWidget(WWT_CAPTION, COLOUR_RED, WID_NAR_CAPTION), SetDataTip(STR_NETWORK_ASK_RELAY_CAPTION, STR_NULL),
@@ -2514,7 +2514,7 @@ struct NetworkAskSurveyWindow : public Window {
}
};
static const NWidgetPart _nested_network_ask_survey_widgets[] = {
static constexpr NWidgetPart _nested_network_ask_survey_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_NAS_CAPTION), SetDataTip(STR_NETWORK_ASK_SURVEY_CAPTION, STR_NULL),