RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 05:07:35 +00:00
Code Issues Activity Actions

Everywhere: Rename {Deprecated => Byte}String

Browse source 
This commit un-deprecates DeprecatedString, and repurposes it as a byte
string.
As the null state has already been removed, there are no other
particularly hairy blockers in repurposing this type as a byte string
(what it _really_ is).

This commit is auto-generated:
  $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \
    Meta Ports Ladybird Tests Kernel)
  $ perl -pie 's/\bDeprecatedString\b/ByteString/g;
    s/deprecated_string/byte_string/g' $xs
  $ clang-format --style=file -i \
    $(git diff --name-only | grep \.cpp\|\.h)
  $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
Ali Mohammad Pur 2023-12-16 17:49:34 +03:30 • committed by Ali Mohammad Pur
parent 38d62563b3
commit 5e1499d104
1615 changed files with 10257 additions and 10257 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibEDID/DMT.cpp
View file

@ -7,7 +7,7 @@
#include <LibEDID/DMT.h>
#ifndef KERNEL
# include <AK/DeprecatedString.h>
# include <AK/ByteString.h>
#endif
namespace EDID {
@ -120,11 +120,11 @@ u32 DMT::MonitorTiming::refresh_rate_hz() const
}
#ifndef KERNEL
DeprecatedString DMT::MonitorTiming::name() const
ByteString DMT::MonitorTiming::name() const
{
if (scan_type == ScanType::Interlaced)
return DeprecatedString::formatted("{} x {} @ {}Hz (Interlaced)", horizontal_pixels, vertical_lines, refresh_rate_hz());
return DeprecatedString::formatted("{} x {} @ {}Hz", horizontal_pixels, vertical_lines, refresh_rate_hz());
return ByteString::formatted("{} x {} @ {}Hz (Interlaced)", horizontal_pixels, vertical_lines, refresh_rate_hz());
return ByteString::formatted("{} x {} @ {}Hz", horizontal_pixels, vertical_lines, refresh_rate_hz());
}
#endif

2
Userland/Libraries/LibEDID/DMT.h
View file

@ -54,7 +54,7 @@ public:
FixedPoint<16, u32> vertical_frequency_hz() const;
u32 refresh_rate_hz() const;
#ifndef KERNEL
DeprecatedString name() const;
ByteString name() const;
#endif
};

18
Userland/Libraries/LibEDID/EDID.cpp
View file

@ -227,7 +227,7 @@ ErrorOr<Parser> Parser::from_display_connector_device(int display_connector_fd)
return from_bytes(move(edid_byte_buffer));
}
ErrorOr<Parser> Parser::from_display_connector_device(DeprecatedString const& display_connector_device)
ErrorOr<Parser> Parser::from_display_connector_device(ByteString const& display_connector_device)
{
int display_connector_fd = open(display_connector_device.characters(), O_RDWR | O_CLOEXEC);
if (display_connector_fd < 0) {
@ -314,7 +314,7 @@ ErrorOr<void> Parser::parse()
#ifdef KERNEL
m_version = TRY(Kernel::KString::formatted("1.{}", (int)m_revision));
#else
m_version = DeprecatedString::formatted("1.{}", (int)m_revision);
m_version = ByteString::formatted("1.{}", (int)m_revision);
#endif
u8 checksum = 0x0;
@ -420,7 +420,7 @@ StringView Parser::legacy_manufacturer_id() const
}
#ifndef KERNEL
DeprecatedString Parser::manufacturer_name() const
ByteString Parser::manufacturer_name() const
{
if (!m_legacy_manufacturer_id_valid)
return "Unknown";
@ -998,9 +998,9 @@ ErrorOr<IterationDecision> Parser::for_each_display_descriptor(Function<Iteratio
}
#ifndef KERNEL
DeprecatedString Parser::display_product_name() const
ByteString Parser::display_product_name() const
{
DeprecatedString product_name;
ByteString product_name;
auto result = for_each_display_descriptor([&](u8 descriptor_tag, Definitions::DisplayDescriptor const& display_descriptor) {
if (descriptor_tag != (u8)Definitions::DisplayDescriptorTag::DisplayProductName)
return IterationDecision::Continue;
@ -1011,7 +1011,7 @@ DeprecatedString Parser::display_product_name() const
break;
str.append((char)byte);
}
product_name = str.to_deprecated_string();
product_name = str.to_byte_string();
return IterationDecision::Break;
});
if (result.is_error()) {
@ -1021,9 +1021,9 @@ DeprecatedString Parser::display_product_name() const
return product_name;
}
DeprecatedString Parser::display_product_serial_number() const
ByteString Parser::display_product_serial_number() const
{
DeprecatedString product_name;
ByteString product_name;
auto result = for_each_display_descriptor([&](u8 descriptor_tag, Definitions::DisplayDescriptor const& display_descriptor) {
if (descriptor_tag != (u8)Definitions::DisplayDescriptorTag::DisplayProductSerialNumber)
return IterationDecision::Continue;
@ -1034,7 +1034,7 @@ DeprecatedString Parser::display_product_serial_number() const
break;
str.append((char)byte);
}
product_name = str.to_deprecated_string();
product_name = str.to_byte_string();
return IterationDecision::Break;
});
if (result.is_error()) {

12
Userland/Libraries/LibEDID/EDID.h
View file

@ -22,7 +22,7 @@
#ifdef KERNEL
# include <Kernel/Library/KString.h>
#else
# include <AK/DeprecatedString.h>
# include <AK/ByteString.h>
#endif
namespace EDID {
@ -87,12 +87,12 @@ public:
#ifndef KERNEL
static ErrorOr<Parser> from_display_connector_device(int);
static ErrorOr<Parser> from_display_connector_device(DeprecatedString const&);
static ErrorOr<Parser> from_display_connector_device(ByteString const&);
#endif
StringView legacy_manufacturer_id() const;
#ifndef KERNEL
DeprecatedString manufacturer_name() const;
ByteString manufacturer_name() const;
#endif
u16 product_code() const;
@ -367,8 +367,8 @@ public:
Optional<DetailedTiming> detailed_timing(size_t) const;
#ifndef KERNEL
DeprecatedString display_product_name() const;
DeprecatedString display_product_serial_number() const;
ByteString display_product_name() const;
ByteString display_product_serial_number() const;
#endif
ErrorOr<IterationDecision> for_each_short_video_descriptor(Function<IterationDecision(unsigned, bool, VIC::Details const&)>) const;
@ -455,7 +455,7 @@ private:
#ifdef KERNEL
OwnPtr<Kernel::KString> m_version;
#else
DeprecatedString m_version;
ByteString m_version;
#endif
char m_legacy_manufacturer_id[4] {};
bool m_legacy_manufacturer_id_valid { false };