1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-09-13 21:17:57 +00:00

Everywhere: Rename {Deprecated => Byte}String

This commit un-deprecates DeprecatedString, and repurposes it as a byte
string.
As the null state has already been removed, there are no other
particularly hairy blockers in repurposing this type as a byte string
(what it _really_ is).

This commit is auto-generated:
  $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \
    Meta Ports Ladybird Tests Kernel)
  $ perl -pie 's/\bDeprecatedString\b/ByteString/g;
    s/deprecated_string/byte_string/g' $xs
  $ clang-format --style=file -i \
    $(git diff --name-only | grep \.cpp\|\.h)
  $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
Ali Mohammad Pur 2023-12-16 17:49:34 +03:30 committed by Ali Mohammad Pur
parent 38d62563b3
commit 5e1499d104
1615 changed files with 10257 additions and 10257 deletions

View file

@ -147,7 +147,7 @@ void Game::show_score_card(bool game_over)
title_builder.append("Score Card"sv);
if (game_over)
title_builder.append(" - Game Over"sv);
score_dialog->set_title(title_builder.to_deprecated_string());
score_dialog->set_title(title_builder.to_byte_string());
RefPtr<Core::Timer> close_timer;
if (!m_players[0].is_human) {
@ -160,7 +160,7 @@ void Game::show_score_card(bool game_over)
score_dialog->exec();
}
void Game::setup(DeprecatedString player_name, int hand_number)
void Game::setup(ByteString player_name, int hand_number)
{
m_players[0].name = move(player_name);
@ -619,7 +619,7 @@ void Game::play_card(Player& player, size_t card_index)
0);
}
bool Game::is_valid_play(Player& player, Card& card, DeprecatedString* explanation) const
bool Game::is_valid_play(Player& player, Card& card, ByteString* explanation) const
{
// First card must be 2 of Clubs.
if (m_trick_number == 0 && m_trick.is_empty()) {
@ -692,7 +692,7 @@ void Game::card_clicked_during_passing(size_t, Card& card)
void Game::card_clicked_during_play(size_t card_index, Card& card)
{
DeprecatedString explanation;
ByteString explanation;
if (!is_valid_play(m_players[0], card, &explanation)) {
if (m_inverted_card)
m_inverted_card->set_inverted(false);

View file

@ -26,7 +26,7 @@ public:
virtual ~Game() override = default;
void setup(DeprecatedString player_name, int hand_number = 0);
void setup(ByteString player_name, int hand_number = 0);
Function<void(String const&)> on_status_change;
@ -41,7 +41,7 @@ private:
void play_card(Player& player, size_t card_index);
bool are_hearts_broken() const;
bool is_valid_play(Player& player, Card& card, DeprecatedString* explanation = nullptr) const;
bool is_valid_play(Player& player, Card& card, ByteString* explanation = nullptr) const;
void let_player_play_card();
void continue_game_after_delay(int interval_ms = 750);
void advance_game();

View file

@ -55,7 +55,7 @@ public:
Gfx::IntRect name_position;
Gfx::TextAlignment name_alignment;
Gfx::IntPoint taken_cards_target;
DeprecatedString name;
ByteString name;
bool is_human { false };
};

View file

@ -70,7 +70,7 @@ void ScoreCard::paint_event(GUI::PaintEvent& event)
text_color);
for (int score_index = 0; score_index < (int)player.scores.size(); score_index++) {
auto text_rect = cell_rect(player_index, 1 + score_index);
auto score_text = DeprecatedString::formatted("{}", player.scores[score_index]);
auto score_text = ByteString::formatted("{}", player.scores[score_index]);
auto score_text_width = font.width_rounded_up(score_text);
if (score_index != (int)player.scores.size() - 1) {
painter.draw_line(

View file

@ -10,7 +10,7 @@
#include <LibGUI/Label.h>
#include <LibGUI/TextBox.h>
SettingsDialog::SettingsDialog(GUI::Window* parent, DeprecatedString player_name)
SettingsDialog::SettingsDialog(GUI::Window* parent, ByteString player_name)
: GUI::Dialog(parent)
, m_player_name(move(player_name))
{

View file

@ -12,10 +12,10 @@
class SettingsDialog : public GUI::Dialog {
C_OBJECT(SettingsDialog)
public:
DeprecatedString const& player_name() const { return m_player_name; }
ByteString const& player_name() const { return m_player_name; }
private:
SettingsDialog(GUI::Window* parent, DeprecatedString player_name);
SettingsDialog(GUI::Window* parent, ByteString player_name);
DeprecatedString m_player_name { "Gunnar" };
ByteString m_player_name { "Gunnar" };
};

View file

@ -59,7 +59,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& statusbar = *widget->find_descendant_of_type_named<GUI::Statusbar>("statusbar");
statusbar.set_text(0, "Score: 0"_string);
DeprecatedString player_name = Config::read_string("Hearts"sv, ""sv, "player_name"sv, "Gunnar"sv);
ByteString player_name = Config::read_string("Hearts"sv, ""sv, "player_name"sv, "Gunnar"sv);
game.on_status_change = [&](String const& status) {
statusbar.set_override_text(status);