RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 14:27:34 +00:00
Code Issues Activity Actions

AK+Everywhere: Rename String to DeprecatedString

Browse source 
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:
Linus Groh 2022-12-04 18:02:33 +00:00 • committed by Andreas Kling
parent f74251606d
commit 6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Games/Flood/SettingsDialog.cpp
View file

@ -46,7 +46,7 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, size_t board_rows, size_t bo
m_board_columns = value;
};
static Vector<String> color_scheme_names;
static Vector<DeprecatedString> color_scheme_names;
color_scheme_names.clear();
Core::DirIterator iterator("/res/terminal-colors", Core::DirIterator::SkipParentAndBaseDir);
while (iterator.has_next()) {
@ -57,7 +57,7 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, size_t board_rows, size_t bo
auto color_scheme_combo = main_widget.find_descendant_of_type_named<GUI::ComboBox>("color_scheme_combo");
color_scheme_combo->set_only_allow_values_from_model(true);
color_scheme_combo->set_model(*GUI::ItemListModel<String>::create(color_scheme_names));
color_scheme_combo->set_model(*GUI::ItemListModel<DeprecatedString>::create(color_scheme_names));
color_scheme_combo->set_selected_index(color_scheme_names.find_first_index(m_color_scheme).value());
color_scheme_combo->set_enabled(color_scheme_names.size() > 1);
color_scheme_combo->on_change = [&](auto&, const GUI::ModelIndex& index) {

2
Userland/Games/Flood/SettingsDialog.h
View file

@ -21,5 +21,5 @@ private:
size_t m_board_rows;
size_t m_board_columns;
String m_color_scheme;
DeprecatedString m_color_scheme;
};

12
Userland/Games/Flood/main.cpp
View file

@ -42,10 +42,10 @@ static ErrorOr<Vector<Color>> get_color_scheme_from_string(StringView name)
"White"sv
};
auto const path = String::formatted("/res/terminal-colors/{}.ini", name);
auto const path = DeprecatedString::formatted("/res/terminal-colors/{}.ini", name);
auto color_config_or_error = Core::ConfigFile::open(path);
if (color_config_or_error.is_error()) {
return Error::from_string_view(String::formatted("Unable to read color scheme file '{}': {}", path, color_config_or_error.error()));
return Error::from_string_view(DeprecatedString::formatted("Unable to read color scheme file '{}': {}", path, color_config_or_error.error()));
}
auto const color_config = color_config_or_error.release_value();
Vector<Color> colors;
@ -118,7 +118,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
size_t board_rows = Config::read_i32("Flood"sv, ""sv, "board_rows"sv, 16);
size_t board_columns = Config::read_i32("Flood"sv, ""sv, "board_columns"sv, 16);
String color_scheme = Config::read_string("Flood"sv, ""sv, "color_scheme"sv, "Default"sv);
DeprecatedString color_scheme = Config::read_string("Flood"sv, ""sv, "color_scheme"sv, "Default"sv);
Config::write_i32("Flood"sv, ""sv, "board_rows"sv, board_rows);
Config::write_i32("Flood"sv, ""sv, "board_columns"sv, board_columns);
@ -155,7 +155,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto update = [&]() {
board_widget->update();
statusbar->set_text(String::formatted("Moves remaining: {}", ai_moves - moves_made));
statusbar->set_text(DeprecatedString::formatted("Moves remaining: {}", ai_moves - moves_made));
};
update();
@ -198,12 +198,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
board_widget->board()->update_values();
update();
if (board_widget->board()->is_flooded()) {
String dialog_text("You have tied with the AI."sv);
DeprecatedString dialog_text("You have tied with the AI."sv);
auto dialog_title("Congratulations!"sv);
if (ai_moves - moves_made == 1)
dialog_text = "You defeated the AI by 1 move."sv;
else if (ai_moves - moves_made > 1)
dialog_text = String::formatted("You defeated the AI by {} moves.", ai_moves - moves_made);
dialog_text = DeprecatedString::formatted("You defeated the AI by {} moves.", ai_moves - moves_made);
else
dialog_title = "Game over!"sv;
GUI::MessageBox::show(window,