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

@ -6,8 +6,8 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/Function.h>
#include <AK/String.h>
#include <LibGfx/Forward.h>
#include <LibGfx/Rect.h>
@ -23,7 +23,7 @@ public:
Separator,
};
MenuItem(Menu&, unsigned identifier, String const& text, String const& shortcut_text = {}, bool enabled = true, bool checkable = false, bool checked = false, Gfx::Bitmap const* icon = nullptr);
MenuItem(Menu&, unsigned identifier, DeprecatedString const& text, DeprecatedString const& shortcut_text = {}, bool enabled = true, bool checkable = false, bool checked = false, Gfx::Bitmap const* icon = nullptr);
MenuItem(Menu&, Type);
~MenuItem() = default;
@ -41,11 +41,11 @@ public:
bool is_default() const { return m_default; }
void set_default(bool);
String text() const { return m_text; }
void set_text(String text) { m_text = move(text); }
DeprecatedString text() const { return m_text; }
void set_text(DeprecatedString text) { m_text = move(text); }
String shortcut_text() const { return m_shortcut_text; }
void set_shortcut_text(String text) { m_shortcut_text = move(text); }
DeprecatedString shortcut_text() const { return m_shortcut_text; }
void set_shortcut_text(DeprecatedString text) { m_shortcut_text = move(text); }
void set_rect(Gfx::IntRect const& rect) { m_rect = rect; }
Gfx::IntRect rect() const;
@ -73,8 +73,8 @@ private:
bool m_checked { false };
bool m_default { false };
unsigned m_identifier { 0 };
String m_text;
String m_shortcut_text;
DeprecatedString m_text;
DeprecatedString m_shortcut_text;
Gfx::IntRect m_rect;
RefPtr<Gfx::Bitmap> m_icon;
int m_submenu_id { -1 };