mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Clang tidy Part 1: Ui Project Function Names (#15956)

Browse Source 
* Add NOLINT around STL using classes and vendor functions

* Apply clang-tidy to ui project function names

* Undo scripting clang-format

* Upper case OpenRCT2 and RCT2
This commit is contained in:
Duncan
2021-11-23 13:18:07 +00:00
committed by GitHub
parent fcf587dfa4
commit bb2c7dbaca
84 changed files with 3939 additions and 3959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
src/openrct2-ui/WindowManager.cpp
View File

@@ -32,7 +32,7 @@ public:
void Init() override
{
ThemeManagerInitialise();
window_new_ride_init_vars();
WindowNewRideInitVars();
}
rct_window* OpenWindow(rct_windowclass wc) override
@@ -40,97 +40,97 @@ public:
switch (wc)
{
case WC_ABOUT:
return window_about_open();
return WindowAboutOpen();
case WC_BOTTOM_TOOLBAR:
return window_game_bottom_toolbar_open();
return WindowGameBottomToolbarOpen();
case WC_CHANGELOG:
return OpenView(WV_CHANGELOG);
case WC_CHEATS:
return window_cheats_open();
return WindowCheatsOpen();
case WC_CLEAR_SCENERY:
return window_clear_scenery_open();
return WindowClearSceneryOpen();
case WC_CUSTOM_CURRENCY_CONFIG:
return custom_currency_window_open();
return CustomCurrencyWindowOpen();
case WC_DEBUG_PAINT:
return window_debug_paint_open();
return WindowDebugPaintOpen();
case WC_EDITOR_INVENTION_LIST:
return window_editor_inventions_list_open();
return WindowEditorInventionsListOpen();
case WC_EDITOR_OBJECT_SELECTION:
return window_editor_object_selection_open();
return WindowEditorObjectSelectionOpen();
case WC_EDITOR_OBJECTIVE_OPTIONS:
return window_editor_objective_options_open();
return WindowEditorObjectiveOptionsOpen();
case WC_EDITOR_SCENARIO_OPTIONS:
return window_editor_scenario_options_open();
return WindowEditorScenarioOptionsOpen();
case WC_FINANCES:
return window_finances_open();
return WindowFinancesOpen();
case WC_FOOTPATH:
return window_footpath_open();
return WindowFootpathOpen();
case WC_GUEST_LIST:
return window_guest_list_open();
return WindowGuestListOpen();
case WC_LAND:
return window_land_open();
return WindowLandOpen();
case WC_LAND_RIGHTS:
return window_land_rights_open();
return WindowLandRightsOpen();
case WC_MAIN_WINDOW:
return window_main_open();
return WindowMainOpen();
case WC_MAP:
return window_map_open();
return WindowMapOpen();
case WC_MAPGEN:
return window_mapgen_open();
return WindowMapgenOpen();
case WC_MULTIPLAYER:
return window_multiplayer_open();
return WindowMultiplayerOpen();
case WC_CONSTRUCT_RIDE:
return window_new_ride_open();
return WindowNewRideOpen();
case WC_PARK_INFORMATION:
return window_park_entrance_open();
return WindowParkEntranceOpen();
case WC_RECENT_NEWS:
return window_news_open();
return WindowNewsOpen();
case WC_RIDE_CONSTRUCTION:
return window_ride_construction_open();
return WindowRideConstructionOpen();
case WC_RESEARCH:
return window_research_open();
return WindowResearchOpen();
case WC_RIDE_LIST:
return window_ride_list_open();
return WindowRideListOpen();
case WC_NOTIFICATION_OPTIONS:
return window_news_options_open();
return WindowNewsOptionsOpen();
case WC_OPTIONS:
return window_options_open();
return WindowOptionsOpen();
case WC_SAVE_PROMPT:
return window_save_prompt_open();
return WindowSavePromptOpen();
case WC_SCENERY:
return window_scenery_open();
return WindowSceneryOpen();
case WC_SCENERY_SCATTER:
return window_scenery_scatter_open();
return WindowSceneryScatterOpen();
#ifndef DISABLE_NETWORK
case WC_SERVER_LIST:
return window_server_list_open();
return WindowServerListOpen();
case WC_SERVER_START:
return window_server_start_open();
return WindowServerStartOpen();
#endif
case WC_KEYBOARD_SHORTCUT_LIST:
return window_shortcut_keys_open();
return WindowShortcutKeysOpen();
case WC_STAFF_LIST:
return window_staff_list_open();
return WindowStaffListOpen();
case WC_THEMES:
return window_themes_open();
return WindowThemesOpen();
case WC_TILE_INSPECTOR:
return window_tile_inspector_open();
return WindowTileInspectorOpen();
case WC_TITLE_EXIT:
return window_title_exit_open();
return WindowTitleExitOpen();
case WC_TITLE_LOGO:
return window_title_logo_open();
return WindowTitleLogoOpen();
case WC_TITLE_MENU:
return window_title_menu_open();
return WindowTitleMenuOpen();
case WC_TITLE_OPTIONS:
return window_title_options_open();
return WindowTitleOptionsOpen();
case WC_TOP_TOOLBAR:
return window_top_toolbar_open();
return WindowTopToolbarOpen();
case WC_VIEW_CLIPPING:
return window_view_clipping_open();
return WindowViewClippingOpen();
case WC_VIEWPORT:
return window_viewport_open();
return WindowViewportOpen();
case WC_WATER:
return window_water_open();
return WindowWaterOpen();
default:
Console::Error::WriteLine("Unhandled window class (%d)", wc);
return nullptr;
@@ -142,33 +142,33 @@ public:
switch (view)
{
case WV_PARK_AWARDS:
return window_park_awards_open();
return WindowParkAwardsOpen();
case WV_PARK_RATING:
return window_park_rating_open();
return WindowParkRatingOpen();
case WV_PARK_OBJECTIVE:
return window_park_objective_open();
return WindowParkObjectiveOpen();
case WV_PARK_GUESTS:
return window_park_guests_open();
return WindowParkGuestsOpen();
case WV_FINANCES_RESEARCH:
return window_finances_research_open();
return WindowFinancesResearchOpen();
case WV_RIDE_RESEARCH:
if (gConfigInterface.toolbar_show_research)
{
return this->OpenWindow(WC_RESEARCH);
}
return window_new_ride_open_research();
return WindowNewRideOpenResearch();
case WV_MAZE_CONSTRUCTION:
return window_maze_construction_open();
return WindowMazeConstructionOpen();
case WV_NETWORK_PASSWORD:
return window_network_status_open_password();
return WindowNetworkStatusOpenPassword();
case WV_EDITOR_BOTTOM_TOOLBAR:
return window_editor_bottom_toolbar_open();
return WindowEditorBottomToolbarOpen();
case WV_EDITOR_MAIN:
return window_editor_main_open();
return WindowEditorMainOpen();
case WV_CHANGELOG:
return window_changelog_open(WV_CHANGELOG);
return WindowChangelogOpen(WV_CHANGELOG);
case WV_NEW_VERSION_INFO:
return window_changelog_open(WV_NEW_VERSION_INFO);
return WindowChangelogOpen(WV_NEW_VERSION_INFO);
default:
return nullptr;
}
@@ -179,20 +179,20 @@ public:
switch (type)
{
case WD_BANNER:
return window_banner_open(id);
return WindowBannerOpen(id);
case WD_DEMOLISH_RIDE:
return window_ride_demolish_prompt_open(get_ride(static_cast<ride_id_t>(id)));
return WindowRideDemolishPromptOpen(get_ride(static_cast<ride_id_t>(id)));
case WD_REFURBISH_RIDE:
return window_ride_refurbish_prompt_open(get_ride(static_cast<ride_id_t>(id)));
return WindowRideRefurbishPromptOpen(get_ride(static_cast<ride_id_t>(id)));
case WD_NEW_CAMPAIGN:
return window_new_campaign_open(id);
return WindowNewCampaignOpen(id);
case WD_SIGN:
return window_sign_open(id);
return WindowSignOpen(id);
case WD_SIGN_SMALL:
return window_sign_small_open(id);
return WindowSignSmallOpen(id);
case WD_PLAYER:
return window_player_open(id);
return WindowPlayerOpen(id);
default:
return nullptr;
@@ -201,12 +201,12 @@ public:
rct_window* ShowError(rct_string_id title, rct_string_id message, const Formatter& args) override
{
return window_error_open(title, message, args);
return WindowErrorOpen(title, message, args);
}
rct_window* ShowError(std::string_view title, std::string_view message) override
{
return window_error_open(title, message);
return WindowErrorOpen(title, message);
}
rct_window* OpenIntent(Intent* intent) override
@@ -214,13 +214,13 @@ public:
switch (intent->GetWindowClass())
{
case WC_PEEP:
return window_guest_open(static_cast<Peep*>(intent->GetPointerExtra(INTENT_EXTRA_PEEP)));
return WindowGuestOpen(static_cast<Peep*>(intent->GetPointerExtra(INTENT_EXTRA_PEEP)));
case WC_FIRE_PROMPT:
return window_staff_fire_prompt_open(static_cast<Peep*>(intent->GetPointerExtra(INTENT_EXTRA_PEEP)));
return WindowStaffFirePromptOpen(static_cast<Peep*>(intent->GetPointerExtra(INTENT_EXTRA_PEEP)));
case WC_INSTALL_TRACK:
return window_install_track_open(intent->GetStringExtra(INTENT_EXTRA_PATH).c_str());
return WindowInstallTrackOpen(intent->GetStringExtra(INTENT_EXTRA_PATH).c_str());
case WC_GUEST_LIST:
return window_guest_list_open_with_filter(
return WindowGuestListOpenWithFilter(
static_cast<GuestListFilterType>(intent->GetSIntExtra(INTENT_EXTRA_GUEST_LIST_FILTER)),
intent->GetSIntExtra(INTENT_EXTRA_RIDE_ID));
case WC_LOADSAVE:
@@ -230,7 +230,7 @@ public:
loadsave_callback callback = reinterpret_cast<loadsave_callback>(
intent->GetPointerExtra(INTENT_EXTRA_CALLBACK));
TrackDesign* trackDesign = static_cast<TrackDesign*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN));
auto* w = window_loadsave_open(
auto* w = WindowLoadsaveOpen(
type, defaultName,
[callback](int32_t result, std::string_view path) {
if (callback != nullptr)
@@ -242,20 +242,20 @@ public:
return w;
}
case WC_MANAGE_TRACK_DESIGN:
return window_track_manage_open(
return WindowTrackManageOpen(
static_cast<track_design_file_ref*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN)));
case WC_NETWORK_STATUS:
{
std::string message = intent->GetStringExtra(INTENT_EXTRA_MESSAGE);
close_callback callback = intent->GetCloseCallbackExtra(INTENT_EXTRA_CALLBACK);
return window_network_status_open(message.c_str(), callback);
return WindowNetworkStatusOpen(message.c_str(), callback);
}
case WC_OBJECT_LOAD_ERROR:
{
std::string path = intent->GetStringExtra(INTENT_EXTRA_PATH);
auto objects = static_cast<const ObjectEntryDescriptor*>(intent->GetPointerExtra(INTENT_EXTRA_LIST));
size_t count = intent->GetUIntExtra(INTENT_EXTRA_LIST_COUNT);
window_object_load_error_open(const_cast<utf8*>(path.c_str()), count, objects);
WindowObjectLoadErrorOpen(const_cast<utf8*>(path.c_str()), count, objects);
return nullptr;
}
@@ -263,35 +263,35 @@ public:
{
const auto rideId = static_cast<ride_id_t>(intent->GetSIntExtra(INTENT_EXTRA_RIDE_ID));
auto ride = get_ride(rideId);
return ride == nullptr ? nullptr : window_ride_main_open(ride);
return ride == nullptr ? nullptr : WindowRideMainOpen(ride);
}
case WC_TRACK_DESIGN_PLACE:
return window_track_place_open(
return WindowTrackPlaceOpen(
static_cast<track_design_file_ref*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN)));
case WC_TRACK_DESIGN_LIST:
{
RideSelection rideItem;
rideItem.Type = intent->GetUIntExtra(INTENT_EXTRA_RIDE_TYPE);
rideItem.EntryIndex = intent->GetUIntExtra(INTENT_EXTRA_RIDE_ENTRY_INDEX);
return window_track_list_open(rideItem);
return WindowTrackListOpen(rideItem);
}
case WC_SCENARIO_SELECT:
return window_scenarioselect_open(
return WindowScenarioselectOpen(
reinterpret_cast<scenarioselect_callback>(intent->GetPointerExtra(INTENT_EXTRA_CALLBACK)), false);
case WD_VEHICLE:
return window_ride_open_vehicle(static_cast<Vehicle*>(intent->GetPointerExtra(INTENT_EXTRA_VEHICLE)));
return WindowRideOpenVehicle(static_cast<Vehicle*>(intent->GetPointerExtra(INTENT_EXTRA_VEHICLE)));
case WD_TRACK:
return window_ride_open_track(static_cast<TileElement*>(intent->GetPointerExtra(INTENT_EXTRA_TILE_ELEMENT)));
return WindowRideOpenTrack(static_cast<TileElement*>(intent->GetPointerExtra(INTENT_EXTRA_TILE_ELEMENT)));
case INTENT_ACTION_NEW_RIDE_OF_TYPE:
{
// Open ride list window
auto w = window_new_ride_open();
auto w = WindowNewRideOpen();
// Switch to right tab and scroll to ride location
RideSelection rideItem;
rideItem.Type = intent->GetUIntExtra(INTENT_EXTRA_RIDE_TYPE);
rideItem.EntryIndex = intent->GetUIntExtra(INTENT_EXTRA_RIDE_ENTRY_INDEX);
window_new_ride_focus(rideItem);
WindowNewRideFocus(rideItem);
return w;
}
@@ -306,11 +306,11 @@ public:
switch (intent.GetWindowClass())
{
case INTENT_ACTION_MAP:
window_map_reset();
WindowMapReset();
break;
case INTENT_ACTION_REFRESH_NEW_RIDES:
window_new_ride_init_vars();
WindowNewRideInitVars();
break;
case INTENT_ACTION_REFRESH_CAMPAIGN_RIDE_LIST:
@@ -324,14 +324,14 @@ public:
auto window = window_find_by_class(WC_RIDE_LIST);
if (window != nullptr)
{
window_ride_list_refresh_list(window);
WindowRideListRefreshList(window);
}
break;
}
case INTENT_ACTION_UPDATE_MAZE_CONSTRUCTION:
window_maze_construction_update_pressed_widgets();
WindowMazeConstructionUpdatePressedWidgets();
break;
case INTENT_ACTION_RIDE_CONSTRUCTION_FOCUS:
@@ -353,31 +353,31 @@ public:
}
case INTENT_ACTION_RIDE_CONSTRUCTION_UPDATE_PIECES:
window_ride_construction_update_enabled_track_pieces();
WindowRideConstructionUpdateEnabledTrackPieces();
break;
case INTENT_ACTION_RIDE_CONSTRUCTION_UPDATE_ACTIVE_ELEMENTS:
window_ride_construction_update_active_elements_impl();
WindowRideConstructionUpdateActiveElementsImpl();
break;
case INTENT_ACTION_INIT_SCENERY:
window_scenery_init();
WindowSceneryInit();
break;
case INTENT_ACTION_SET_DEFAULT_SCENERY_CONFIG:
window_scenery_set_default_placement_configuration();
WindowScenerySetDefaultPlacementConfiguration();
break;
case INTENT_ACTION_REFRESH_SCENERY:
window_scenery_reset_selected_scenery_items();
WindowSceneryResetSelectedSceneryItems();
break;
case INTENT_ACTION_INVALIDATE_TICKER_NEWS:
window_game_bottom_toolbar_invalidate_news_item();
WindowGameBottomToolbarInvalidateNewsItem();
break;
case INTENT_ACTION_REFRESH_GUEST_LIST:
window_guest_list_refresh_list();
WindowGuestListRefreshList();
break;
case INTENT_ACTION_REFRESH_STAFF_LIST:
@@ -387,7 +387,7 @@ public:
}
case INTENT_ACTION_CLEAR_TILE_INSPECTOR_CLIPBOARD:
window_tile_inspector_clear_clipboard();
WindowTileInspectorClearClipboard();
break;
case INTENT_ACTION_INVALIDATE_VEHICLE_WINDOW:
@@ -433,7 +433,7 @@ public:
gToolbarDirtyFlags |= BTM_TB_DIRTY_FLAG_PEEP_COUNT;
window_invalidate_by_class(WC_GUEST_LIST);
window_invalidate_by_class(WC_PARK_INFORMATION);
window_guest_list_refresh_list();
WindowGuestListRefreshList();
break;
case INTENT_ACTION_UPDATE_PARK_RATING:
@@ -491,7 +491,7 @@ public:
switch (windowClass)
{
case WC_NETWORK_STATUS:
window_network_status_close();
WindowNetworkStatusClose();
break;
default:
@@ -501,7 +501,7 @@ public:
void UpdateMapTooltip() override
{
window_map_tooltip_update_visibility();
WindowMapTooltipUpdateVisibility();
}
void HandleInput() override