mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 17:17:45 +00:00
AK+Everywhere: Rename String to DeprecatedString
We have a new, improved string type coming up in AK (OOM aware, no null state), and while it's going to use UTF-8, the name UTF8String is a mouthful - so let's free up the String name by renaming the existing class. Making the old one have an annoying name will hopefully also help with quick adoption :^)
This commit is contained in:
parent
f74251606d
commit
6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
|
@ -162,7 +162,7 @@ void Game::show_score_card(bool game_over)
|
|||
score_dialog->exec();
|
||||
}
|
||||
|
||||
void Game::setup(String player_name, int hand_number)
|
||||
void Game::setup(DeprecatedString player_name, int hand_number)
|
||||
{
|
||||
m_players[0].name = move(player_name);
|
||||
|
||||
|
@ -409,7 +409,7 @@ void Game::let_player_play_card()
|
|||
if (&player == &m_players[0])
|
||||
on_status_change("Select a card to play.");
|
||||
else
|
||||
on_status_change(String::formatted("Waiting for {} to play a card...", player));
|
||||
on_status_change(DeprecatedString::formatted("Waiting for {} to play a card...", player));
|
||||
|
||||
if (player.is_human) {
|
||||
m_human_can_play = true;
|
||||
|
@ -618,7 +618,7 @@ void Game::play_card(Player& player, size_t card_index)
|
|||
0);
|
||||
}
|
||||
|
||||
bool Game::is_valid_play(Player& player, Card& card, String* explanation) const
|
||||
bool Game::is_valid_play(Player& player, Card& card, DeprecatedString* explanation) const
|
||||
{
|
||||
// First card must be 2 of Clubs.
|
||||
if (m_trick_number == 0 && m_trick.is_empty()) {
|
||||
|
@ -691,14 +691,14 @@ void Game::card_clicked_during_passing(size_t, Card& card)
|
|||
|
||||
void Game::card_clicked_during_play(size_t card_index, Card& card)
|
||||
{
|
||||
String explanation;
|
||||
DeprecatedString explanation;
|
||||
if (!is_valid_play(m_players[0], card, &explanation)) {
|
||||
if (m_inverted_card)
|
||||
m_inverted_card->set_inverted(false);
|
||||
card.set_inverted(true);
|
||||
update(card.rect());
|
||||
m_inverted_card = card;
|
||||
on_status_change(String::formatted("You can't play this card: {}", explanation));
|
||||
on_status_change(DeprecatedString::formatted("You can't play this card: {}", explanation));
|
||||
continue_game_after_delay();
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -26,9 +26,9 @@ public:
|
|||
|
||||
virtual ~Game() override = default;
|
||||
|
||||
void setup(String player_name, int hand_number = 0);
|
||||
void setup(DeprecatedString player_name, int hand_number = 0);
|
||||
|
||||
Function<void(String const&)> on_status_change;
|
||||
Function<void(DeprecatedString const&)> on_status_change;
|
||||
|
||||
private:
|
||||
Game();
|
||||
|
@ -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, String* explanation = nullptr) const;
|
||||
bool is_valid_play(Player& player, Card& card, DeprecatedString* explanation = nullptr) const;
|
||||
void let_player_play_card();
|
||||
void continue_game_after_delay(int interval_ms = 750);
|
||||
void advance_game();
|
||||
|
|
|
@ -55,7 +55,7 @@ public:
|
|||
Gfx::IntRect name_position;
|
||||
Gfx::TextAlignment name_alignment;
|
||||
Gfx::IntPoint taken_cards_target;
|
||||
String name;
|
||||
DeprecatedString name;
|
||||
bool is_human { false };
|
||||
};
|
||||
|
||||
|
|
|
@ -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 = String::formatted("{}", player.scores[score_index]);
|
||||
auto score_text = DeprecatedString::formatted("{}", player.scores[score_index]);
|
||||
auto score_text_width = font.width(score_text);
|
||||
if (score_index != (int)player.scores.size() - 1) {
|
||||
painter.draw_line(
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <LibGUI/Label.h>
|
||||
#include <LibGUI/TextBox.h>
|
||||
|
||||
SettingsDialog::SettingsDialog(GUI::Window* parent, String player_name)
|
||||
SettingsDialog::SettingsDialog(GUI::Window* parent, DeprecatedString player_name)
|
||||
: GUI::Dialog(parent)
|
||||
, m_player_name(move(player_name))
|
||||
{
|
||||
|
|
|
@ -12,10 +12,10 @@
|
|||
class SettingsDialog : public GUI::Dialog {
|
||||
C_OBJECT(SettingsDialog)
|
||||
public:
|
||||
String const& player_name() const { return m_player_name; }
|
||||
DeprecatedString const& player_name() const { return m_player_name; }
|
||||
|
||||
private:
|
||||
SettingsDialog(GUI::Window* parent, String player_name);
|
||||
SettingsDialog(GUI::Window* parent, DeprecatedString player_name);
|
||||
|
||||
String m_player_name { "Gunnar" };
|
||||
DeprecatedString m_player_name { "Gunnar" };
|
||||
};
|
||||
|
|
|
@ -58,7 +58,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 player_name = Config::read_string("Hearts"sv, ""sv, "player_name"sv, "Gunnar"sv);
|
||||
DeprecatedString player_name = Config::read_string("Hearts"sv, ""sv, "player_name"sv, "Gunnar"sv);
|
||||
|
||||
game.on_status_change = [&](const AK::StringView& status) {
|
||||
statusbar.set_override_text(status);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue