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

Everywhere: Rename {Deprecated => Byte}String

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Applications/GamesSettings/CardSettingsWidget.cpp
View file

@ -88,7 +88,7 @@ ErrorOr<void> CardSettingsWidget::initialize()
TRY(m_card_front_sets.try_append(entry.name));
return IterationDecision::Continue;
}));
auto piece_set_model = GUI::ItemListModel<DeprecatedString>::create(m_card_front_sets);
auto piece_set_model = GUI::ItemListModel<ByteString>::create(m_card_front_sets);
m_card_front_images_combo_box->set_model(piece_set_model);
auto card_front_set = Config::read_string("Games"sv, "Cards"sv, "CardFrontImages"sv, default_card_front_image_set);
if (card_front_set.is_empty())
@ -103,7 +103,7 @@ ErrorOr<void> CardSettingsWidget::initialize()
m_card_back_image_view = find_descendant_of_type_named<GUI::IconView>("cards_back_image");
m_card_back_image_view->set_model(GUI::FileSystemModel::create("/res/graphics/cards/backs"));
m_card_back_image_view->set_model_column(GUI::FileSystemModel::Column::Name);
if (!set_card_back_image_path(TRY(String::from_deprecated_string(Config::read_string("Games"sv, "Cards"sv, "CardBackImage"sv)))))
if (!set_card_back_image_path(TRY(String::from_byte_string(Config::read_string("Games"sv, "Cards"sv, "CardBackImage"sv)))))
set_card_back_image_path(default_card_back_image_path);
m_card_back_image_view->on_selection_change = [&]() {
auto& card_back_selection = m_card_back_image_view->selection();
@ -140,7 +140,7 @@ void CardSettingsWidget::reset_default_values()
bool CardSettingsWidget::set_card_back_image_path(StringView path)
{
auto index = static_cast<GUI::FileSystemModel*>(m_card_back_image_view->model())->index(path.to_deprecated_string(), m_card_back_image_view->model_column());
auto index = static_cast<GUI::FileSystemModel*>(m_card_back_image_view->model())->index(path.to_byte_string(), m_card_back_image_view->model_column());
if (index.is_valid()) {
m_card_back_image_view->set_cursor(index, GUI::AbstractView::SelectionUpdate::Set);
Cards::CardPainter::the().set_back_image_path(path);
@ -156,7 +156,7 @@ String CardSettingsWidget::card_back_image_path() const
GUI::ModelIndex card_back_image_index = m_last_selected_card_back;
if (!card_back_selection.is_empty())
card_back_image_index = card_back_selection.first();
return String::from_deprecated_string(static_cast<GUI::FileSystemModel const*>(m_card_back_image_view->model())->full_path(card_back_image_index)).release_value_but_fixme_should_propagate_errors();
return String::from_byte_string(static_cast<GUI::FileSystemModel const*>(m_card_back_image_view->model())->full_path(card_back_image_index)).release_value_but_fixme_should_propagate_errors();
}
String CardSettingsWidget::card_front_images_set_name() const
@ -164,7 +164,7 @@ String CardSettingsWidget::card_front_images_set_name() const
auto selected_set_name = m_card_front_images_combo_box->text();
if (selected_set_name == "None")
return {};
return MUST(String::from_deprecated_string(selected_set_name));
return MUST(String::from_byte_string(selected_set_name));
}
}

2
Userland/Applications/GamesSettings/CardSettingsWidget.h
View file

@ -35,7 +35,7 @@ private:
String card_back_image_path() const;
String card_front_images_set_name() const;
Vector<DeprecatedString> m_card_front_sets;
Vector<ByteString> m_card_front_sets;
RefPtr<CardGamePreview> m_preview_frame;
RefPtr<GUI::ColorInput> m_background_color_input;

6
Userland/Applications/GamesSettings/ChessSettingsWidget.cpp
View file

@ -251,12 +251,12 @@ ErrorOr<void> ChessSettingsWidget::initialize()
TRY(m_piece_sets.try_append(entry.name));
return IterationDecision::Continue;
}));
auto piece_set_model = GUI::ItemListModel<DeprecatedString>::create(m_piece_sets);
auto piece_set_model = GUI::ItemListModel<ByteString>::create(m_piece_sets);
m_piece_set_combobox->set_model(piece_set_model);
m_piece_set_combobox->set_text(piece_set_name, GUI::AllowCallback::No);
m_piece_set_combobox->on_change = [&](auto& value, auto&) {
set_modified(true);
m_preview->set_piece_set_name(MUST(String::from_deprecated_string(value)));
m_preview->set_piece_set_name(MUST(String::from_byte_string(value)));
};
m_board_theme_combobox = find_descendant_of_type_named<GUI::ComboBox>("board_theme");
@ -283,7 +283,7 @@ ErrorOr<void> ChessSettingsWidget::initialize()
set_modified(true);
};
m_preview->set_piece_set_name(TRY(String::from_deprecated_string(piece_set_name)));
m_preview->set_piece_set_name(TRY(String::from_byte_string(piece_set_name)));
m_preview->set_dark_square_color(board_theme.dark_square_color);
m_preview->set_light_square_color(board_theme.light_square_color);
m_preview->set_show_coordinates(show_coordinates);

2
Userland/Applications/GamesSettings/ChessSettingsWidget.h
View file

@ -28,7 +28,7 @@ private:
ChessSettingsWidget() = default;
ErrorOr<void> initialize();
Vector<DeprecatedString> m_piece_sets;
Vector<ByteString> m_piece_sets;
RefPtr<GamesSettings::ChessGamePreview> m_preview;
RefPtr<GUI::ComboBox> m_piece_set_combobox;