RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:17:35 +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

6
Userland/Applications/PixelPaint/Tools/GuideTool.cpp
View file

@ -74,7 +74,7 @@ void GuideTool::on_mousedown(Layer*, MouseEvent& event)
if (m_selected_guide) {
m_guide_origin = m_selected_guide->offset();
GUI::Application::the()->show_tooltip_immediately(String::formatted("{}", m_guide_origin), GUI::Application::the()->tooltip_source_widget());
GUI::Application::the()->show_tooltip_immediately(DeprecatedString::formatted("{}", m_guide_origin), GUI::Application::the()->tooltip_source_widget());
}
}
@ -120,7 +120,7 @@ void GuideTool::on_mousemove(Layer*, MouseEvent& event)
m_selected_guide->set_offset(new_offset);
GUI::Application::the()->show_tooltip_immediately(String::formatted("{}", new_offset), GUI::Application::the()->tooltip_source_widget());
GUI::Application::the()->show_tooltip_immediately(DeprecatedString::formatted("{}", new_offset), GUI::Application::the()->tooltip_source_widget());
editor()->layers_did_change();
}
@ -140,7 +140,7 @@ void GuideTool::on_context_menu(Layer*, GUI::ContextMenuEvent& event)
return;
auto dialog = EditGuideDialog::construct(
editor()->window(),
String::formatted("{}", m_context_menu_guide->offset()),
DeprecatedString::formatted("{}", m_context_menu_guide->offset()),
m_context_menu_guide->orientation());
if (dialog->exec() != GUI::Dialog::ExecResult::OK)
return;

2
Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp
View file

@ -205,7 +205,7 @@ GUI::Widget* RectangleSelectTool::get_properties_widget()
auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo.set_only_allow_values_from_model(true);
mode_combo.set_model(*GUI::ItemListModel<String>::create(m_merge_mode_names));
mode_combo.set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names));
mode_combo.set_selected_index((int)m_merge_mode);
mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0);

2
Userland/Applications/PixelPaint/Tools/RectangleSelectTool.h
View file

@ -40,7 +40,7 @@ private:
};
RefPtr<GUI::Widget> m_properties_widget;
Vector<String> m_merge_mode_names {};
Vector<DeprecatedString> m_merge_mode_names {};
Selection::MergeMode m_merge_mode { Selection::MergeMode::Set };
float m_edge_feathering { 0.0f };
bool m_selecting { false };

2
Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp
View file

@ -120,7 +120,7 @@ GUI::Widget* WandSelectTool::get_properties_widget()
auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo.set_only_allow_values_from_model(true);
mode_combo.set_model(*GUI::ItemListModel<String>::create(m_merge_mode_names));
mode_combo.set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names));
mode_combo.set_selected_index((int)m_merge_mode);
mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0);

2
Userland/Applications/PixelPaint/Tools/WandSelectTool.h
View file

@ -31,7 +31,7 @@ private:
int m_threshold { 0 };
RefPtr<GUI::Widget> m_properties_widget;
Vector<String> m_merge_mode_names {};
Vector<DeprecatedString> m_merge_mode_names {};
Selection::MergeMode m_merge_mode { Selection::MergeMode::Set };
};