diff options
| author | Linus Groh <mail@linusgroh.de> | 2022-12-04 18:02:33 +0000 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-12-06 08:54:33 +0100 |
| commit | 6e19ab2bbce0b113b628e6f8e9b5c0640053933e (patch) | |
| tree | 372d21b2f5dcff112f5d0089559c6af5798680d4 /Userland/Libraries/LibEDID/EDID.h | |
| parent | f74251606d74b504a1379ebb893fdb5529054ea5 (diff) | |
| download | serenity-6e19ab2bbce0b113b628e6f8e9b5c0640053933e.zip | |
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 :^)
Diffstat (limited to 'Userland/Libraries/LibEDID/EDID.h')
| -rw-r--r-- | Userland/Libraries/LibEDID/EDID.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Userland/Libraries/LibEDID/EDID.h b/Userland/Libraries/LibEDID/EDID.h index 3d3282f296..eff8f26be0 100644 --- a/Userland/Libraries/LibEDID/EDID.h +++ b/Userland/Libraries/LibEDID/EDID.h @@ -21,7 +21,7 @@ #ifdef KERNEL # include <Kernel/KString.h> #else -# include <AK/String.h> +# include <AK/DeprecatedString.h> #endif namespace EDID { @@ -86,12 +86,12 @@ public: #ifndef KERNEL static ErrorOr<Parser> from_display_connector_device(int); - static ErrorOr<Parser> from_display_connector_device(String const&); + static ErrorOr<Parser> from_display_connector_device(DeprecatedString const&); #endif StringView legacy_manufacturer_id() const; #ifndef KERNEL - String manufacturer_name() const; + DeprecatedString manufacturer_name() const; #endif u16 product_code() const; @@ -366,8 +366,8 @@ public: Optional<DetailedTiming> detailed_timing(size_t) const; #ifndef KERNEL - String display_product_name() const; - String display_product_serial_number() const; + DeprecatedString display_product_name() const; + DeprecatedString display_product_serial_number() const; #endif ErrorOr<IterationDecision> for_each_short_video_descriptor(Function<IterationDecision(unsigned, bool, VIC::Details const&)>) const; @@ -454,7 +454,7 @@ private: #ifdef KERNEL OwnPtr<Kernel::KString> m_version; #else - String m_version; + DeprecatedString m_version; #endif char m_legacy_manufacturer_id[4] {}; bool m_legacy_manufacturer_id_valid { false }; |