RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 08:37: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

8
Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp
View file

@ -21,7 +21,7 @@ ClipboardHistoryModel::ClipboardHistoryModel()
{
}
String ClipboardHistoryModel::column_name(int column) const
DeprecatedString ClipboardHistoryModel::column_name(int column) const
{
switch (column) {
case Column::Data:
@ -37,7 +37,7 @@ String ClipboardHistoryModel::column_name(int column) const
}
}
static StringView bpp_for_format_resilient(String format)
static StringView bpp_for_format_resilient(DeprecatedString format)
{
unsigned format_uint = format.to_uint().value_or(static_cast<unsigned>(Gfx::BitmapFormat::Invalid));
// Cannot use Gfx::Bitmap::bpp_for_format here, as we have to accept invalid enum values.
@ -70,7 +70,7 @@ GUI::Variant ClipboardHistoryModel::data(const GUI::ModelIndex& index, GUI::Mode
switch (index.column()) {
case Column::Data:
if (data_and_type.mime_type.starts_with("text/"sv))
return String::copy(data_and_type.data);
return DeprecatedString::copy(data_and_type.data);
if (data_and_type.mime_type == "image/x-serenityos") {
StringBuilder builder;
builder.append('[');
@ -128,7 +128,7 @@ void ClipboardHistoryModel::remove_item(int index)
m_history_items.remove(index);
}
void ClipboardHistoryModel::config_string_did_change(String const& domain, String const& group, String const& key, String const& value_string)
void ClipboardHistoryModel::config_string_did_change(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key, DeprecatedString const& value_string)
{
if (domain != "ClipboardHistory" || group != "ClipboardHistory")
return;

6
Userland/Applets/ClipboardHistory/ClipboardHistoryModel.h
View file

@ -42,7 +42,7 @@ public:
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
// ^Config::Listener
virtual void config_string_did_change(String const& domain, String const& group, String const& key, String const& value) override;
virtual void config_string_did_change(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key, DeprecatedString const& value) override;
private:
ClipboardHistoryModel();
@ -50,11 +50,11 @@ private:
// ^GUI::Model
virtual int row_count(const GUI::ModelIndex&) const override { return m_history_items.size(); }
virtual String column_name(int) const override;
virtual DeprecatedString column_name(int) const override;
virtual int column_count(const GUI::ModelIndex&) const override { return Column::__Count; }
// ^GUI::Clipboard::ClipboardClient
virtual void clipboard_content_did_change(String const&) override { add_item(GUI::Clipboard::the().fetch_data_and_type()); }
virtual void clipboard_content_did_change(DeprecatedString const&) override { add_item(GUI::Clipboard::the().fetch_data_and_type()); }
Vector<ClipboardItem> m_history_items;
size_t m_history_limit;