diff --git a/Userland/Libraries/LibWeb/Layout/AvailableSpace.cpp b/Userland/Libraries/LibWeb/Layout/AvailableSpace.cpp index c7be758df8..a7fdd4020a 100644 --- a/Userland/Libraries/LibWeb/Layout/AvailableSpace.cpp +++ b/Userland/Libraries/LibWeb/Layout/AvailableSpace.cpp @@ -30,24 +30,24 @@ AvailableSize AvailableSize::make_max_content() return AvailableSize { Type::MaxContent, CSSPixels::max() }; } -DeprecatedString AvailableSize::to_deprecated_string() const +String AvailableSize::to_string() const { switch (m_type) { case Type::Definite: - return DeprecatedString::formatted("definite({})", m_value); + return MUST(String::formatted("definite({})", m_value)); case Type::Indefinite: - return "indefinite"; + return "indefinite"_string; case Type::MinContent: - return "min-content"; + return "min-content"_string; case Type::MaxContent: - return "max-content"; + return "max-content"_string; } VERIFY_NOT_REACHED(); } -DeprecatedString AvailableSpace::to_deprecated_string() const +String AvailableSpace::to_string() const { - return DeprecatedString::formatted("{} x {}", width, height); + return MUST(String::formatted("{} x {}", width, height)); } AvailableSize::AvailableSize(Type type, CSSPixels value) diff --git a/Userland/Libraries/LibWeb/Layout/AvailableSpace.h b/Userland/Libraries/LibWeb/Layout/AvailableSpace.h index 0e665de694..67cb72d16e 100644 --- a/Userland/Libraries/LibWeb/Layout/AvailableSpace.h +++ b/Userland/Libraries/LibWeb/Layout/AvailableSpace.h @@ -6,8 +6,8 @@ #pragma once -#include #include +#include #include #include @@ -40,7 +40,7 @@ public: return m_value; } - DeprecatedString to_deprecated_string() const; + String to_string() const; bool operator==(AvailableSize const& other) const = default; bool operator<(AvailableSize const& other) const { return m_value < other.m_value; } @@ -92,7 +92,7 @@ public: AvailableSize width; AvailableSize height; - DeprecatedString to_deprecated_string() const; + String to_string() const; }; } @@ -101,7 +101,7 @@ template<> struct AK::Formatter : Formatter { ErrorOr format(FormatBuilder& builder, Web::Layout::AvailableSize const& available_size) { - return Formatter::format(builder, available_size.to_deprecated_string()); + return Formatter::format(builder, available_size.to_string()); } }; @@ -109,6 +109,6 @@ template<> struct AK::Formatter : Formatter { ErrorOr format(FormatBuilder& builder, Web::Layout::AvailableSpace const& available_space) { - return Formatter::format(builder, available_space.to_deprecated_string()); + return Formatter::format(builder, available_space.to_string()); } };