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

14
Userland/Applications/Presenter/SlideObject.h
View file

@ -71,7 +71,7 @@ public:
virtual void paint(Gfx::Painter&, Gfx::FloatSize display_scale) const override;
void set_font(String font) { m_font = move(font); }
void set_font(DeprecatedString font) { m_font = move(font); }
StringView font() const { return m_font; }
void set_font_size(int font_size) { m_font_size = font_size; }
int font_size() const { return m_font_size; }
@ -79,13 +79,13 @@ public:
unsigned font_weight() const { return m_font_weight; }
void set_text_alignment(Gfx::TextAlignment text_alignment) { m_text_alignment = text_alignment; }
Gfx::TextAlignment text_alignment() const { return m_text_alignment; }
void set_text(String text) { m_text = move(text); }
void set_text(DeprecatedString text) { m_text = move(text); }
StringView text() const { return m_text; }
protected:
String m_text;
DeprecatedString m_text;
// The font family, technically speaking.
String m_font;
DeprecatedString m_font;
int m_font_size;
unsigned m_font_weight;
Gfx::TextAlignment m_text_alignment;
@ -110,12 +110,12 @@ public:
virtual void paint(Gfx::Painter&, Gfx::FloatSize display_scale) const override;
void set_image_path(String image_path)
void set_image_path(DeprecatedString image_path)
{
m_image_path = move(image_path);
auto result = reload_image();
if (result.is_error())
GUI::MessageBox::show_error(m_window, String::formatted("Loading image {} failed: {}", m_image_path, result.error()));
GUI::MessageBox::show_error(m_window, DeprecatedString::formatted("Loading image {} failed: {}", m_image_path, result.error()));
}
StringView image_path() const { return m_image_path; }
void set_scaling(ImageScaling scaling) { m_scaling = scaling; }
@ -124,7 +124,7 @@ public:
Gfx::Painter::ScalingMode scaling_mode() const { return m_scaling_mode; }
protected:
String m_image_path;
DeprecatedString m_image_path;
ImageScaling m_scaling { ImageScaling::FitSmallest };
Gfx::Painter::ScalingMode m_scaling_mode { Gfx::Painter::ScalingMode::SmoothPixels };