mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 02:37:36 +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:
parent
f74251606d
commit
6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
|
@ -19,11 +19,11 @@ class Label : public Frame {
|
|||
public:
|
||||
virtual ~Label() override = default;
|
||||
|
||||
String text() const { return m_text; }
|
||||
void set_text(String);
|
||||
DeprecatedString text() const { return m_text; }
|
||||
void set_text(DeprecatedString);
|
||||
|
||||
void set_icon(Gfx::Bitmap const*);
|
||||
void set_icon_from_path(String const&);
|
||||
void set_icon_from_path(DeprecatedString const&);
|
||||
Gfx::Bitmap const* icon() const { return m_icon.ptr(); }
|
||||
Gfx::Bitmap* icon() { return m_icon.ptr(); }
|
||||
|
||||
|
@ -45,7 +45,7 @@ public:
|
|||
Gfx::IntRect text_rect() const;
|
||||
|
||||
protected:
|
||||
explicit Label(String text = {});
|
||||
explicit Label(DeprecatedString text = {});
|
||||
|
||||
virtual void paint_event(PaintEvent&) override;
|
||||
virtual void did_change_text() { }
|
||||
|
@ -53,7 +53,7 @@ protected:
|
|||
private:
|
||||
void size_to_fit();
|
||||
|
||||
String m_text;
|
||||
DeprecatedString m_text;
|
||||
RefPtr<Gfx::Bitmap> m_icon;
|
||||
Gfx::TextAlignment m_text_alignment { Gfx::TextAlignment::Center };
|
||||
Gfx::TextWrapping m_text_wrapping { Gfx::TextWrapping::Wrap };
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue