From 2479256bc1b4a591a9bbc9409ae6b112ca14ea6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Breno=20Rodrigues=20Guimar=C3=A3es?= Date: Mon, 20 Apr 2020 18:55:15 -0300 Subject: [PATCH] Adjust Formatter function names according to coding style (#11378) --- src/openrct2-ui/interface/Widget.cpp | 2 +- src/openrct2-ui/windows/GuestList.cpp | 16 ++-- src/openrct2-ui/windows/NewCampaign.cpp | 4 +- src/openrct2-ui/windows/ObjectLoadError.cpp | 14 ++-- src/openrct2/actions/GameAction.cpp | 2 +- src/openrct2/localisation/Localisation.h | 6 +- src/openrct2/network/Network.cpp | 2 +- src/openrct2/peep/Peep.cpp | 86 ++++++++++----------- src/openrct2/ride/Ride.cpp | 40 +++++----- src/openrct2/world/Banner.cpp | 14 ++-- 10 files changed, 93 insertions(+), 93 deletions(-) diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index d3c88aa443..8e013ea215 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -450,7 +450,7 @@ static void widget_groupbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widg utf8 buffer[512] = { 0 }; uint8_t args[sizeof(uintptr_t)] = { 0 }; format_string(buffer, sizeof(buffer), widget->text, gCommonFormatArgs); - Formatter(args).add(buffer); + Formatter(args).Add(buffer); gfx_draw_string_left(dpi, STR_STRING, args, colour, l, t); textRight = l + gfx_get_string_width(buffer) + 1; } diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 1a9c10688d..c907f58762 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -291,8 +291,8 @@ rct_window* window_guest_list_open_with_filter(int32_t type, int32_t index) auto ride = get_ride(index & 0xFF); if (ride != nullptr) { - ft.add(ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IN_RIDE) ? STR_IN_RIDE : STR_ON_RIDE); - ride->FormatNameTo(ft.buf()); + ft.Add(ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IN_RIDE) ? STR_IN_RIDE : STR_ON_RIDE); + ride->FormatNameTo(ft.Buf()); _window_guest_list_selected_filter = 0; _window_guest_list_highlighted_index = 0xFFFF; @@ -306,8 +306,8 @@ rct_window* window_guest_list_open_with_filter(int32_t type, int32_t index) auto ride = get_ride(index & 0xFF); if (ride != nullptr) { - ft.add(STR_QUEUING_FOR); - ride->FormatNameTo(ft.buf()); + ft.Add(STR_QUEUING_FOR); + ride->FormatNameTo(ft.Buf()); _window_guest_list_selected_filter = 0; _window_guest_list_highlighted_index = 0xFFFF; @@ -321,8 +321,8 @@ rct_window* window_guest_list_open_with_filter(int32_t type, int32_t index) auto ride = get_ride(index & 0xFF); if (ride != nullptr) { - ft.add(STR_NONE); - ride->FormatNameTo(ft.buf()); + ft.Add(STR_NONE); + ride->FormatNameTo(ft.Buf()); _window_guest_list_selected_filter = 1; _window_guest_list_highlighted_index = 0xFFFF; @@ -333,7 +333,7 @@ rct_window* window_guest_list_open_with_filter(int32_t type, int32_t index) } case GLFT_GUESTS_THINKING_X: { - ft.add(PeepThoughts[index & 0xFF]); + ft.Add(PeepThoughts[index & 0xFF]); _window_guest_list_selected_filter = 1; _window_guest_list_highlighted_index = 0xFFFF; @@ -878,7 +878,7 @@ static int32_t window_guest_list_is_peep_in_filter(Peep* peep) if (_window_guest_list_filter_arguments.GetFirstStringId() == STR_NONE && _window_guest_list_selected_filter == 1) { - Formatter(peepArgs.args).add(STR_NONE); + Formatter(peepArgs.args).Add(STR_NONE); } if (_window_guest_list_filter_arguments == peepArgs) diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index fb3ee3268b..cec87014bb 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -265,12 +265,12 @@ static void window_new_campaign_mousedown(rct_window* w, rct_widgetindex widgetI Formatter ft(reinterpret_cast(&gDropdownItemsArgs[numItems])); if (ride->custom_name.empty()) { - ride->FormatNameTo(ft.buf()); + ride->FormatNameTo(ft.Buf()); } else { gDropdownItemsFormat[numItems] = STR_OPTIONS_DROPDOWN_ITEM; - ft.add(ride->custom_name.c_str()); + ft.Add(ride->custom_name.c_str()); } numItems++; } diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index 89cf83a853..e17c9292c5 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -115,17 +115,17 @@ private: Formatter ft(args); if (_downloadStatusInfo.Source.empty()) { - ft.add(static_cast(_downloadStatusInfo.Count)); - ft.add(static_cast(_downloadStatusInfo.Total)); - ft.add(_downloadStatusInfo.Name.c_str()); + ft.Add(static_cast(_downloadStatusInfo.Count)); + ft.Add(static_cast(_downloadStatusInfo.Total)); + ft.Add(_downloadStatusInfo.Name.c_str()); format_string(str_downloading_objects, sizeof(str_downloading_objects), STR_DOWNLOADING_OBJECTS, args); } else { - ft.add(_downloadStatusInfo.Name.c_str()); - ft.add(_downloadStatusInfo.Source.c_str()); - ft.add(static_cast(_downloadStatusInfo.Count)); - ft.add(static_cast(_downloadStatusInfo.Total)); + ft.Add(_downloadStatusInfo.Name.c_str()); + ft.Add(_downloadStatusInfo.Source.c_str()); + ft.Add(static_cast(_downloadStatusInfo.Count)); + ft.Add(static_cast(_downloadStatusInfo.Total)); format_string(str_downloading_objects, sizeof(str_downloading_objects), STR_DOWNLOADING_OBJECTS_FROM, args); } diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index db83e9e348..7c85b5979c 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -272,7 +272,7 @@ namespace GameActions { result->Error = GA_ERROR::INSUFFICIENT_FUNDS; result->ErrorMessage = STR_NOT_ENOUGH_CASH_REQUIRES; - Formatter(result->ErrorMessageArgs.data()).add(result->Cost); + Formatter(result->ErrorMessageArgs.data()).Add(result->Cost); } } return result; diff --git a/src/openrct2/localisation/Localisation.h b/src/openrct2/localisation/Localisation.h index 0d7b45411c..92fcad29fc 100644 --- a/src/openrct2/localisation/Localisation.h +++ b/src/openrct2/localisation/Localisation.h @@ -117,17 +117,17 @@ public: { } - auto buf() + auto Buf() { return CurrentBuf; } - std::size_t bytes() const + std::size_t NumBytes() const { return CurrentBuf - StartBuf; } - template Formatter& add(TDeduced value) + template Formatter& Add(TDeduced value) { uintptr_t convertedValue; if constexpr (std::is_integral_v) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 53fb6c648f..d732d77ba7 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -2451,7 +2451,7 @@ void Network::Client_Handle_GAMESTATE(NetworkConnection& connection, NetworkPack log_info("Wrote desync report to '%s'", outputFile.c_str()); uint8_t args[32]{}; - Formatter(args).add(uniqueFileName); + Formatter(args).Add(uniqueFileName); char str_desync[1024]; format_string(str_desync, sizeof(str_desync), STR_DESYNC_REPORT, args); diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index b1e223657c..0dc597c06a 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -1790,10 +1790,10 @@ void Peep::FormatActionTo(void* argsV) const switch (state) { case PEEP_STATE_FALLING: - ft.add(action == PEEP_ACTION_DROWNING ? STR_DROWNING : STR_WALKING); + ft.Add(action == PEEP_ACTION_DROWNING ? STR_DROWNING : STR_WALKING); break; case PEEP_STATE_1: - ft.add(STR_WALKING); + ft.Add(STR_WALKING); break; case PEEP_STATE_ON_RIDE: case PEEP_STATE_LEAVING_RIDE: @@ -1802,26 +1802,26 @@ void Peep::FormatActionTo(void* argsV) const auto ride = get_ride(current_ride); if (ride != nullptr) { - ft.add(ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IN_RIDE) ? STR_IN_RIDE : STR_ON_RIDE); - ride->FormatNameTo(ft.buf()); + ft.Add(ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IN_RIDE) ? STR_IN_RIDE : STR_ON_RIDE); + ride->FormatNameTo(ft.Buf()); } else { - ft.add(STR_ON_RIDE).add(STR_NONE); + ft.Add(STR_ON_RIDE).Add(STR_NONE); } break; } case PEEP_STATE_BUYING: { - ft.add(STR_AT_RIDE); + ft.Add(STR_AT_RIDE); auto ride = get_ride(current_ride); if (ride != nullptr) { - ride->FormatNameTo(ft.buf()); + ride->FormatNameTo(ft.Buf()); } else { - ft.add(STR_NONE); + ft.Add(STR_NONE); } break; } @@ -1832,13 +1832,13 @@ void Peep::FormatActionTo(void* argsV) const auto ride = get_ride(guest_heading_to_ride_id); if (ride != nullptr) { - ft.add(STR_HEADING_FOR); - ride->FormatNameTo(ft.buf()); + ft.Add(STR_HEADING_FOR); + ride->FormatNameTo(ft.Buf()); } } else { - ft.add((peep_flags & PEEP_FLAGS_LEAVING_PARK) ? STR_LEAVING_PARK : STR_WALKING); + ft.Add((peep_flags & PEEP_FLAGS_LEAVING_PARK) ? STR_LEAVING_PARK : STR_WALKING); } break; case PEEP_STATE_QUEUING_FRONT: @@ -1847,13 +1847,13 @@ void Peep::FormatActionTo(void* argsV) const auto ride = get_ride(current_ride); if (ride != nullptr) { - ft.add(STR_QUEUING_FOR); - ride->FormatNameTo(ft.buf()); + ft.Add(STR_QUEUING_FOR); + ride->FormatNameTo(ft.Buf()); } break; } case PEEP_STATE_SITTING: - ft.add(STR_SITTING); + ft.Add(STR_SITTING); break; case PEEP_STATE_WATCHING: if (current_ride != RIDE_ID_NULL) @@ -1861,97 +1861,97 @@ void Peep::FormatActionTo(void* argsV) const auto ride = get_ride(current_ride); if (ride != nullptr) { - ft.add((current_seat & 0x1) ? STR_WATCHING_CONSTRUCTION_OF : STR_WATCHING_RIDE); - ride->FormatNameTo(ft.buf()); + ft.Add((current_seat & 0x1) ? STR_WATCHING_CONSTRUCTION_OF : STR_WATCHING_RIDE); + ride->FormatNameTo(ft.Buf()); } } else { - ft.add((current_seat & 0x1) ? STR_WATCHING_NEW_RIDE_BEING_CONSTRUCTED : STR_LOOKING_AT_SCENERY); + ft.Add((current_seat & 0x1) ? STR_WATCHING_NEW_RIDE_BEING_CONSTRUCTED : STR_LOOKING_AT_SCENERY); } break; case PEEP_STATE_PICKED: - ft.add(STR_SELECT_LOCATION); + ft.Add(STR_SELECT_LOCATION); break; case PEEP_STATE_PATROLLING: case PEEP_STATE_ENTERING_PARK: case PEEP_STATE_LEAVING_PARK: - ft.add(STR_WALKING); + ft.Add(STR_WALKING); break; case PEEP_STATE_MOWING: - ft.add(STR_MOWING_GRASS); + ft.Add(STR_MOWING_GRASS); break; case PEEP_STATE_SWEEPING: - ft.add(STR_SWEEPING_FOOTPATH); + ft.Add(STR_SWEEPING_FOOTPATH); break; case PEEP_STATE_WATERING: - ft.add(STR_WATERING_GARDENS); + ft.Add(STR_WATERING_GARDENS); break; case PEEP_STATE_EMPTYING_BIN: - ft.add(STR_EMPTYING_LITTER_BIN); + ft.Add(STR_EMPTYING_LITTER_BIN); break; case PEEP_STATE_ANSWERING: if (sub_state == 0) { - ft.add(STR_WALKING); + ft.Add(STR_WALKING); } else if (sub_state == 1) { - ft.add(STR_ANSWERING_RADIO_CALL); + ft.Add(STR_ANSWERING_RADIO_CALL); } else { - ft.add(STR_RESPONDING_TO_RIDE_BREAKDOWN_CALL); + ft.Add(STR_RESPONDING_TO_RIDE_BREAKDOWN_CALL); auto ride = get_ride(current_ride); if (ride != nullptr) { - ride->FormatNameTo(ft.buf()); + ride->FormatNameTo(ft.Buf()); } else { - ft.add(STR_NONE); + ft.Add(STR_NONE); } } break; case PEEP_STATE_FIXING: { - ft.add(STR_FIXING_RIDE); + ft.Add(STR_FIXING_RIDE); auto ride = get_ride(current_ride); if (ride != nullptr) { - ride->FormatNameTo(ft.buf()); + ride->FormatNameTo(ft.Buf()); } else { - ft.add(STR_NONE); + ft.Add(STR_NONE); } break; } case PEEP_STATE_HEADING_TO_INSPECTION: { - ft.add(STR_HEADING_TO_RIDE_FOR_INSPECTION); + ft.Add(STR_HEADING_TO_RIDE_FOR_INSPECTION); auto ride = get_ride(current_ride); if (ride != nullptr) { - ride->FormatNameTo(ft.buf()); + ride->FormatNameTo(ft.Buf()); } else { - ft.add(STR_NONE); + ft.Add(STR_NONE); } break; } case PEEP_STATE_INSPECTING: { - ft.add(STR_INSPECTING_RIDE); + ft.Add(STR_INSPECTING_RIDE); auto ride = get_ride(current_ride); if (ride != nullptr) { - ride->FormatNameTo(ft.buf()); + ride->FormatNameTo(ft.Buf()); } else { - ft.add(STR_NONE); + ft.Add(STR_NONE); } break; } @@ -1978,23 +1978,23 @@ size_t Peep::FormatNameTo(void* argsV) const staffNameIndex = 0; } - ft.add(staffNames[staffNameIndex]); - ft.add(id); - return ft.bytes(); + ft.Add(staffNames[staffNameIndex]); + ft.Add(id); + return ft.NumBytes(); } else if (gParkFlags & PARK_FLAGS_SHOW_REAL_GUEST_NAMES) { auto realNameStringId = get_real_name_string_id_from_id(id); - return ft.add(realNameStringId).bytes(); + return ft.Add(realNameStringId).NumBytes(); } else { - return ft.add(STR_GUEST_X).add(id).bytes(); + return ft.Add(STR_GUEST_X).Add(id).NumBytes(); } } else { - return ft.add(STR_STRING).add(name).bytes(); + return ft.Add(STR_STRING).Add(name).NumBytes(); } } diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index ff10d39c11..e87100121e 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -757,11 +757,11 @@ void Ride::FormatStatusTo(void* argsV) const if (lifecycle_flags & RIDE_LIFECYCLE_CRASHED) { - ft.add(STR_CRASHED); + ft.Add(STR_CRASHED); } else if (lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) { - ft.add(STR_BROKEN_DOWN); + ft.Add(STR_BROKEN_DOWN); } else if (status == RIDE_STATUS_CLOSED) { @@ -769,26 +769,26 @@ void Ride::FormatStatusTo(void* argsV) const { if (num_riders != 0) { - ft.add(num_riders == 1 ? STR_CLOSED_WITH_PERSON : STR_CLOSED_WITH_PEOPLE); - ft.add(num_riders); + ft.Add(num_riders == 1 ? STR_CLOSED_WITH_PERSON : STR_CLOSED_WITH_PEOPLE); + ft.Add(num_riders); } else { - ft.add(STR_CLOSED); + ft.Add(STR_CLOSED); } } else { - ft.add(STR_CLOSED); + ft.Add(STR_CLOSED); } } else if (status == RIDE_STATUS_SIMULATING) { - ft.add(STR_SIMULATING); + ft.Add(STR_SIMULATING); } else if (status == RIDE_STATUS_TESTING) { - ft.add(STR_TEST_RUN); + ft.Add(STR_TEST_RUN); } else if ( mode == RIDE_MODE_RACE && !(lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) @@ -798,23 +798,23 @@ void Ride::FormatStatusTo(void* argsV) const if (sprite != nullptr && sprite->IsPeep()) { auto peep = sprite->AsPeep(); - ft.add(STR_RACE_WON_BY); - peep->FormatNameTo(ft.buf()); + ft.Add(STR_RACE_WON_BY); + peep->FormatNameTo(ft.Buf()); } else { - ft.add(STR_RACE_WON_BY); - ft.add(STR_NONE); + ft.Add(STR_RACE_WON_BY); + ft.Add(STR_NONE); } } else if (!ride_type_has_flag(type, RIDE_TYPE_FLAG_IS_SHOP)) { - ft.add(num_riders == 1 ? STR_PERSON_ON_RIDE : STR_PEOPLE_ON_RIDE); - ft.add(num_riders); + ft.Add(num_riders == 1 ? STR_PERSON_ON_RIDE : STR_PEOPLE_ON_RIDE); + ft.Add(num_riders); } else { - ft.add(STR_OPEN); + ft.Add(STR_OPEN); } } @@ -7788,9 +7788,9 @@ size_t Ride::FormatNameTo(void* argsV) const if (!custom_name.empty()) { auto str = custom_name.c_str(); - ft.add(STR_STRING); - ft.add(str); - return ft.bytes(); + ft.Add(STR_STRING); + ft.Add(str); + return ft.NumBytes(); } else { @@ -7815,7 +7815,7 @@ size_t Ride::FormatNameTo(void* argsV) const } } } - ft.add(1).add(rideTypeName).add(default_name_number); - return ft.bytes(); + ft.Add(1).Add(rideTypeName).Add(default_name_number); + return ft.NumBytes(); } } diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index 3c96abaed1..563f785615 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -70,10 +70,10 @@ size_t Banner::FormatTextTo(void* argsV, bool addColour) const if (addColour) { - ft.add(STR_STRING_STRINGID).add(colourToUtf8(text_colour)); + ft.Add(STR_STRING_STRINGID).Add(colourToUtf8(text_colour)); } - return ft.bytes() + FormatTextTo(ft.buf()); + return ft.NumBytes() + FormatTextTo(ft.Buf()); } size_t Banner::FormatTextTo(void* argsV) const @@ -82,27 +82,27 @@ size_t Banner::FormatTextTo(void* argsV) const if (flags & BANNER_FLAG_NO_ENTRY) { - return ft.add(STR_NO_ENTRY).bytes(); + return ft.Add(STR_NO_ENTRY).NumBytes(); } else if (flags & BANNER_FLAG_LINKED_TO_RIDE) { auto ride = get_ride(ride_index); if (ride != nullptr) { - return ride->FormatNameTo(ft.buf()); + return ride->FormatNameTo(ft.Buf()); } else { - return ft.add(STR_DEFAULT_SIGN).bytes(); + return ft.Add(STR_DEFAULT_SIGN).NumBytes(); } } else if (text.empty()) { - return ft.add(STR_DEFAULT_SIGN).bytes(); + return ft.Add(STR_DEFAULT_SIGN).NumBytes(); } else { - return ft.add(STR_STRING).add(text.c_str()).bytes(); + return ft.Add(STR_STRING).Add(text.c_str()).NumBytes(); } }