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

View file

@ -19,8 +19,8 @@ public:
virtual ~QuickLaunchEntry() = default;
virtual ErrorOr<void> launch() const = 0;
virtual GUI::Icon icon() const = 0;
virtual String name() const = 0;
virtual String file_name_to_watch() const = 0;
virtual DeprecatedString name() const = 0;
virtual DeprecatedString file_name_to_watch() const = 0;
static OwnPtr<QuickLaunchEntry> create_from_config_value(StringView path);
static OwnPtr<QuickLaunchEntry> create_from_path(StringView path);
@ -35,8 +35,8 @@ public:
virtual ErrorOr<void> launch() const override;
virtual GUI::Icon icon() const override { return m_app_file->icon(); }
virtual String name() const override { return m_app_file->name(); }
virtual String file_name_to_watch() const override { return {}; }
virtual DeprecatedString name() const override { return m_app_file->name(); }
virtual DeprecatedString file_name_to_watch() const override { return {}; }
private:
NonnullRefPtr<Desktop::AppFile> m_app_file;
@ -44,33 +44,33 @@ private:
class QuickLaunchEntryExecutable : public QuickLaunchEntry {
public:
explicit QuickLaunchEntryExecutable(String path)
explicit QuickLaunchEntryExecutable(DeprecatedString path)
: m_path(move(path))
{
}
virtual ErrorOr<void> launch() const override;
virtual GUI::Icon icon() const override;
virtual String name() const override;
virtual String file_name_to_watch() const override { return m_path; }
virtual DeprecatedString name() const override;
virtual DeprecatedString file_name_to_watch() const override { return m_path; }
private:
String m_path;
DeprecatedString m_path;
};
class QuickLaunchEntryFile : public QuickLaunchEntry {
public:
explicit QuickLaunchEntryFile(String path)
explicit QuickLaunchEntryFile(DeprecatedString path)
: m_path(move(path))
{
}
virtual ErrorOr<void> launch() const override;
virtual GUI::Icon icon() const override;
virtual String name() const override;
virtual String file_name_to_watch() const override { return m_path; }
virtual DeprecatedString name() const override;
virtual DeprecatedString file_name_to_watch() const override { return m_path; }
private:
String m_path;
DeprecatedString m_path;
};
class QuickLaunchWidget : public GUI::Frame
@ -80,18 +80,18 @@ class QuickLaunchWidget : public GUI::Frame
public:
virtual ~QuickLaunchWidget() override = default;
virtual void config_key_was_removed(String const&, String const&, String const&) override;
virtual void config_string_did_change(String const&, String const&, String const&, String const&) override;
virtual void config_key_was_removed(DeprecatedString const&, DeprecatedString const&, DeprecatedString const&) override;
virtual void config_string_did_change(DeprecatedString const&, DeprecatedString const&, DeprecatedString const&, DeprecatedString const&) override;
virtual void drag_enter_event(GUI::DragEvent&) override;
virtual void drop_event(GUI::DropEvent&) override;
private:
QuickLaunchWidget();
void add_or_adjust_button(String const&, NonnullOwnPtr<QuickLaunchEntry>&&);
void add_or_adjust_button(DeprecatedString const&, NonnullOwnPtr<QuickLaunchEntry>&&);
RefPtr<GUI::Menu> m_context_menu;
RefPtr<GUI::Action> m_context_menu_default_action;
String m_context_menu_app_name;
DeprecatedString m_context_menu_app_name;
RefPtr<Core::FileWatcher> m_watcher;
};