1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:47:34 +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

@ -33,7 +33,7 @@ public:
static Menu* from_menu_id(int);
int menu_id() const { return m_menu_id; }
String const& name() const { return m_name; }
DeprecatedString const& name() const { return m_name; }
Gfx::Bitmap const* icon() const { return m_icon.ptr(); }
void set_icon(Gfx::Bitmap const*);
@ -41,11 +41,11 @@ public:
ErrorOr<void> try_add_action(NonnullRefPtr<Action>);
ErrorOr<void> try_add_separator();
ErrorOr<NonnullRefPtr<Menu>> try_add_submenu(String name);
ErrorOr<NonnullRefPtr<Menu>> try_add_submenu(DeprecatedString name);
void add_action(NonnullRefPtr<Action>);
void add_separator();
Menu& add_submenu(String name);
Menu& add_submenu(DeprecatedString name);
void remove_all_actions();
void popup(Gfx::IntPoint const& screen_position, RefPtr<Action> const& default_action = nullptr, Gfx::IntRect const& button_rect = {});
@ -64,7 +64,7 @@ public:
private:
friend class Menubar;
explicit Menu(String name = "");
explicit Menu(DeprecatedString name = "");
int realize_menu(RefPtr<Action> default_action = nullptr);
void unrealize_menu();
@ -73,7 +73,7 @@ private:
void realize_menu_item(MenuItem&, int item_id);
int m_menu_id { -1 };
String m_name;
DeprecatedString m_name;
RefPtr<Gfx::Bitmap> m_icon;
NonnullOwnPtrVector<MenuItem> m_items;
WeakPtr<Action> m_current_default_action;