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

8
Userland/Libraries/LibGfx/TextLayout.h
View file

@ -7,8 +7,8 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/Forward.h>
#include <AK/String.h>
#include <AK/Utf32View.h>
#include <AK/Utf8View.h>
#include <AK/Vector.h>
@ -60,7 +60,7 @@ public:
IntRect const& rect() const { return m_rect; }
void set_rect(IntRect const& rect) { m_rect = rect; }
Vector<String, 32> lines(TextElision elision, TextWrapping wrapping, int line_spacing) const
Vector<DeprecatedString, 32> lines(TextElision elision, TextWrapping wrapping, int line_spacing) const
{
return wrap_lines(elision, wrapping, line_spacing, FitWithinRect::Yes);
}
@ -68,8 +68,8 @@ public:
IntRect bounding_rect(TextWrapping wrapping, int line_spacing) const;
private:
Vector<String, 32> wrap_lines(TextElision, TextWrapping, int line_spacing, FitWithinRect) const;
String elide_text_from_right(Utf8View, bool force_elision) const;
Vector<DeprecatedString, 32> wrap_lines(TextElision, TextWrapping, int line_spacing, FitWithinRect) const;
DeprecatedString elide_text_from_right(Utf8View, bool force_elision) const;
Font const* m_font;
Utf8View m_text;