mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 00:34:46 +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

102
src/openrct2-ui/windows/ScenarioSelect.cpp
View File

@@ -100,17 +100,17 @@ static constexpr const rct_string_id ScenarioOriginStringIds[] = {
STR_SCENARIO_CATEGORY_OTHER_PARKS,
};
static void window_scenarioselect_init_tabs(rct_window *w);
static void WindowScenarioselectInitTabs(rct_window *w);
static void window_scenarioselect_close(rct_window *w);
static void window_scenarioselect_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_scenarioselect_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_scenarioselect_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_scenarioselect_scrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_scenarioselect_scrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_scenarioselect_invalidate(rct_window *w);
static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowScenarioselectClose(rct_window *w);
static void WindowScenarioselectMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowScenarioselectMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowScenarioselectScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowScenarioselectScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowScenarioselectScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowScenarioselectInvalidate(rct_window *w);
static void WindowScenarioselectPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowScenarioselectScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static bool ScenarioSelectUseSmallFont()
{
@@ -119,23 +119,23 @@ static bool ScenarioSelectUseSmallFont()
static rct_window_event_list window_scenarioselect_events([](auto& events)
{
events.close = &window_scenarioselect_close;
events.mouse_up = &window_scenarioselect_mouseup;
events.mouse_down = &window_scenarioselect_mousedown;
events.get_scroll_size = &window_scenarioselect_scrollgetsize;
events.scroll_mousedown = &window_scenarioselect_scrollmousedown;
events.scroll_mouseover = &window_scenarioselect_scrollmouseover;
events.invalidate = &window_scenarioselect_invalidate;
events.paint = &window_scenarioselect_paint;
events.scroll_paint = &window_scenarioselect_scrollpaint;
events.close = &WindowScenarioselectClose;
events.mouse_up = &WindowScenarioselectMouseup;
events.mouse_down = &WindowScenarioselectMousedown;
events.get_scroll_size = &WindowScenarioselectScrollgetsize;
events.scroll_mousedown = &WindowScenarioselectScrollmousedown;
events.scroll_mouseover = &WindowScenarioselectScrollmouseover;
events.invalidate = &WindowScenarioselectInvalidate;
events.paint = &WindowScenarioselectPaint;
events.scroll_paint = &WindowScenarioselectScrollpaint;
});
// clang-format on
static void draw_category_heading(
static void DrawCategoryHeading(
rct_window* w, rct_drawpixelinfo* dpi, int32_t left, int32_t right, int32_t y, rct_string_id stringId);
static void initialise_list_items(rct_window* w);
static bool is_scenario_visible(rct_window* w, const scenario_index_entry* scenario);
static bool is_locking_enabled(rct_window* w);
static void InitialiseListItems(rct_window* w);
static bool IsScenarioVisible(rct_window* w, const scenario_index_entry* scenario);
static bool IsLockingEnabled(rct_window* w);
static std::function<void(std::string_view)> _callback;
static bool _showLockedInformation = false;
@@ -151,7 +151,7 @@ static int32_t ScenarioSelectGetWindowWidth()
return WW;
}
rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool titleEditor)
rct_window* WindowScenarioselectOpen(scenarioselect_callback callback, bool titleEditor)
{
if (_titleEditor != titleEditor)
{
@@ -163,7 +163,7 @@ rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool ti
if (window != nullptr)
return window;
return window_scenarioselect_open(
return WindowScenarioselectOpen(
[callback](std::string_view scenario) { callback(std::string(scenario).c_str()); }, titleEditor, titleEditor);
}
@@ -171,7 +171,7 @@ rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool ti
*
* rct2: 0x006781B5
*/
rct_window* window_scenarioselect_open(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking)
rct_window* WindowScenarioselectOpen(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking)
{
rct_window* window;
int32_t windowWidth;
@@ -192,8 +192,8 @@ rct_window* window_scenarioselect_open(std::function<void(std::string_view)> cal
window->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB1) | (1ULL << WIDX_TAB2) | (1ULL << WIDX_TAB3)
| (1ULL << WIDX_TAB4) | (1ULL << WIDX_TAB5) | (1ULL << WIDX_TAB6) | (1ULL << WIDX_TAB7) | (1ULL << WIDX_TAB8);
window_scenarioselect_init_tabs(window);
initialise_list_items(window);
WindowScenarioselectInitTabs(window);
InitialiseListItems(window);
WindowInitScrollWidgets(window);
window->highlighted_scenario = nullptr;
@@ -205,7 +205,7 @@ rct_window* window_scenarioselect_open(std::function<void(std::string_view)> cal
*
* rct2: 0x00677C8A
*/
static void window_scenarioselect_init_tabs(rct_window* w)
static void WindowScenarioselectInitTabs(rct_window* w)
{
int32_t showPages = 0;
size_t numScenarios = scenario_repository_get_count();
@@ -259,13 +259,13 @@ static void window_scenarioselect_init_tabs(rct_window* w)
}
}
static void window_scenarioselect_close(rct_window* w)
static void WindowScenarioselectClose(rct_window* w)
{
_listItems.clear();
_listItems.shrink_to_fit();
}
static void window_scenarioselect_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowScenarioselectMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
{
@@ -273,7 +273,7 @@ static void window_scenarioselect_mouseup(rct_window* w, rct_widgetindex widgetI
}
}
static void window_scenarioselect_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowScenarioselectMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
if (widgetIndex >= WIDX_TAB1 && widgetIndex <= WIDX_TAB8)
{
@@ -281,7 +281,7 @@ static void window_scenarioselect_mousedown(rct_window* w, rct_widgetindex widge
w->highlighted_scenario = nullptr;
gConfigInterface.scenarioselect_last_tab = w->selected_tab;
config_save_default();
initialise_list_items(w);
InitialiseListItems(w);
w->Invalidate();
window_event_resize_call(w);
window_event_invalidate_call(w);
@@ -290,7 +290,7 @@ static void window_scenarioselect_mousedown(rct_window* w, rct_widgetindex widge
}
}
static int32_t get_scenario_list_item_size()
static int32_t GetScenarioListItemSize()
{
if (!LocalisationService_UseTrueTypeFont())
return 24;
@@ -304,9 +304,9 @@ static int32_t get_scenario_list_item_size()
return lineHeight;
}
static void window_scenarioselect_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowScenarioselectScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
const int32_t scenarioItemHeight = get_scenario_list_item_size();
const int32_t scenarioItemHeight = GetScenarioListItemSize();
int32_t y = 0;
for (const auto& listItem : _listItems)
@@ -328,9 +328,9 @@ static void window_scenarioselect_scrollgetsize(rct_window* w, int32_t scrollInd
*
* rct2: 0x6780FE
*/
static void window_scenarioselect_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowScenarioselectScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
const int32_t scenarioItemHeight = get_scenario_list_item_size();
const int32_t scenarioItemHeight = GetScenarioListItemSize();
auto mutableScreenCoords = screenCoords;
for (const auto& listItem : _listItems)
@@ -365,9 +365,9 @@ static void window_scenarioselect_scrollmousedown(rct_window* w, int32_t scrollI
*
* rct2: 0x678162
*/
static void window_scenarioselect_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowScenarioselectScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
const int32_t scenarioItemHeight = get_scenario_list_item_size();
const int32_t scenarioItemHeight = GetScenarioListItemSize();
bool originalShowLockedInformation = _showLockedInformation;
_showLockedInformation = false;
@@ -412,7 +412,7 @@ static void window_scenarioselect_scrollmouseover(rct_window* w, int32_t scrollI
}
}
static void window_scenarioselect_invalidate(rct_window* w)
static void WindowScenarioselectInvalidate(rct_window* w)
{
w->pressed_widgets &= ~(
(1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB1) | (1ULL << WIDX_TAB2) | (1ULL << WIDX_TAB3) | (1ULL << WIDX_TAB4)
@@ -436,7 +436,7 @@ static void window_scenarioselect_invalidate(rct_window* w)
window_scenarioselect_widgets[WIDX_SCENARIOLIST].bottom = windowHeight - bottomMargin;
}
static void window_scenarioselect_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowScenarioselectPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t format;
const scenario_index_entry* scenario;
@@ -555,7 +555,7 @@ static void window_scenarioselect_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
}
static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowScenarioselectScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
uint8_t paletteIndex = ColourMapA[w->colours[1]].mid_light;
gfx_clear(dpi, paletteIndex);
@@ -566,7 +566,7 @@ static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo*
const auto& listWidget = w->widgets[WIDX_SCENARIOLIST];
int32_t listWidth = listWidget.width() - 12;
const int32_t scenarioItemHeight = get_scenario_list_item_size();
const int32_t scenarioItemHeight = GetScenarioListItemSize();
// Scenario title
int32_t scenarioTitleHeight = font_get_line_height(FontSpriteBase::MEDIUM);
@@ -584,7 +584,7 @@ static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo*
case LIST_ITEM_TYPE::HEADING:
{
const int32_t horizontalRuleMargin = 4;
draw_category_heading(
DrawCategoryHeading(
w, dpi, horizontalRuleMargin, listWidth - horizontalRuleMargin, y + 2, listItem.heading.string_id);
y += 18;
break;
@@ -647,7 +647,7 @@ static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo*
}
}
static void draw_category_heading(
static void DrawCategoryHeading(
rct_window* w, rct_drawpixelinfo* dpi, int32_t left, int32_t right, int32_t y, rct_string_id stringId)
{
colour_t baseColour = w->colours[1];
@@ -686,7 +686,7 @@ static void draw_category_heading(
gfx_draw_line(dpi, { darkLineLeftTop2, darkLineRightBottom2 }, darkColour);
}
static void initialise_list_items(rct_window* w)
static void InitialiseListItems(rct_window* w)
{
size_t numScenarios = scenario_repository_get_count();
_listItems.clear();
@@ -702,7 +702,7 @@ static void initialise_list_items(rct_window* w)
{
const scenario_index_entry* scenario = scenario_repository_get_by_index(i);
if (!is_scenario_visible(w, scenario))
if (!IsScenarioVisible(w, scenario))
continue;
if (_titleEditor && scenario->source_game == ScenarioSource::Other)
continue;
@@ -754,7 +754,7 @@ static void initialise_list_items(rct_window* w)
sc_list_item scenarioItem;
scenarioItem.type = LIST_ITEM_TYPE::SCENARIO;
scenarioItem.scenario.scenario = scenario;
if (is_locking_enabled(w))
if (IsLockingEnabled(w))
{
scenarioItem.scenario.is_locked = numUnlocks <= 0;
if (scenario->highscore == nullptr)
@@ -810,7 +810,7 @@ static void initialise_list_items(rct_window* w)
}
}
static bool is_scenario_visible(rct_window* w, const scenario_index_entry* scenario)
static bool IsScenarioVisible(rct_window* w, const scenario_index_entry* scenario)
{
if (gConfigGeneral.scenario_select_mode == SCENARIO_SELECT_MODE_ORIGIN || _titleEditor)
{
@@ -834,7 +834,7 @@ static bool is_scenario_visible(rct_window* w, const scenario_index_entry* scena
return true;
}
static bool is_locking_enabled(rct_window* w)
static bool IsLockingEnabled(rct_window* w)
{
if (gConfigGeneral.scenario_select_mode != SCENARIO_SELECT_MODE_ORIGIN)
return false;