1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 03:07:35 +00:00

Everywhere: Rename {Deprecated => Byte}String

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

View file

@ -7,8 +7,8 @@
#pragma once
#include <AK/ByteBuffer.h>
#include <AK/ByteString.h>
#include <AK/DeprecatedFlyString.h>
#include <AK/DeprecatedString.h>
#include <AK/HashMap.h>
#include <AK/OwnPtr.h>
#include <AK/Time.h>
@ -18,7 +18,7 @@
namespace Video::Matroska {
struct EBMLHeader {
DeprecatedString doc_type;
ByteString doc_type;
u32 doc_type_version;
};
@ -27,9 +27,9 @@ public:
u64 timestamp_scale() const { return m_timestamp_scale; }
void set_timestamp_scale(u64 timestamp_scale) { m_timestamp_scale = timestamp_scale; }
Utf8View muxing_app() const { return Utf8View(m_muxing_app); }
void set_muxing_app(DeprecatedString muxing_app) { m_muxing_app = move(muxing_app); }
void set_muxing_app(ByteString muxing_app) { m_muxing_app = move(muxing_app); }
Utf8View writing_app() const { return Utf8View(m_writing_app); }
void set_writing_app(DeprecatedString writing_app) { m_writing_app = move(writing_app); }
void set_writing_app(ByteString writing_app) { m_writing_app = move(writing_app); }
Optional<double> duration_unscaled() const { return m_duration_unscaled; }
void set_duration_unscaled(double duration) { m_duration_unscaled.emplace(duration); }
Optional<Duration> duration() const
@ -41,8 +41,8 @@ public:
private:
u64 m_timestamp_scale { 1'000'000 };
DeprecatedString m_muxing_app;
DeprecatedString m_writing_app;
ByteString m_muxing_app;
ByteString m_writing_app;
Optional<double> m_duration_unscaled;
};

View file

@ -980,13 +980,13 @@ DecoderErrorOr<void> SampleIterator::seek_to_cue_point(CuePoint const& cue_point
return {};
}
ErrorOr<DeprecatedString> Streamer::read_string()
ErrorOr<ByteString> Streamer::read_string()
{
auto string_length = TRY(read_variable_size_integer());
if (remaining() < string_length)
return Error::from_string_literal("String length extends past the end of the stream");
auto string_data = data_as_chars();
auto string_value = DeprecatedString(string_data, strnlen(string_data, string_length));
auto string_value = ByteString(string_data, strnlen(string_data, string_length));
TRY(read_raw_octets(string_length));
return string_value;
}

View file

@ -145,7 +145,7 @@ public:
ErrorOr<u64> read_u64();
ErrorOr<double> read_float();
ErrorOr<DeprecatedString> read_string();
ErrorOr<ByteString> read_string();
ErrorOr<void> read_unknown_element();

View file

@ -6,7 +6,7 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/ByteString.h>
#include <AK/Error.h>
#include <AK/Format.h>
#include <AK/SourceLocation.h>
@ -43,7 +43,7 @@ public:
static DecoderError format(DecoderErrorCategory category, CheckedFormatString<Parameters...>&& format_string, Parameters const&... parameters)
{
AK::VariadicFormatParams<AK::AllowDebugOnlyFormatters::No, Parameters...> variadic_format_params { parameters... };
return DecoderError::with_description(category, DeprecatedString::vformatted(format_string.view(), variadic_format_params));
return DecoderError::with_description(category, ByteString::vformatted(format_string.view(), variadic_format_params));
}
static DecoderError from_source_location(DecoderErrorCategory category, StringView description, SourceLocation location = SourceLocation::current())
@ -66,14 +66,14 @@ public:
StringView string_literal() const { return m_description; }
private:
DecoderError(DecoderErrorCategory category, DeprecatedString description)
DecoderError(DecoderErrorCategory category, ByteString description)
: m_category(category)
, m_description(move(description))
{
}
DecoderErrorCategory m_category { DecoderErrorCategory::Unknown };
DeprecatedString m_description;
ByteString m_description;
};
#define DECODER_TRY(category, expression) \

View file

@ -495,7 +495,7 @@ private:
debug_string_builder.append("a future frame"sv);
}
debug_string_builder.append(", checking for error and buffering"sv);
dbgln_if(PLAYBACK_MANAGER_DEBUG, debug_string_builder.to_deprecated_string());
dbgln_if(PLAYBACK_MANAGER_DEBUG, debug_string_builder.to_byte_string());
#endif
if (future_frame_item.has_value()) {
if (future_frame_item->is_error()) {

View file

@ -63,11 +63,11 @@ public:
bool is_empty() const { return m_data.has<Empty>(); }
DeprecatedString debug_string() const
ByteString debug_string() const
{
if (is_error())
return DeprecatedString::formatted("{} at {}ms", error().string_literal(), timestamp().to_milliseconds());
return DeprecatedString::formatted("frame at {}ms", timestamp().to_milliseconds());
return ByteString::formatted("{} at {}ms", error().string_literal(), timestamp().to_milliseconds());
return ByteString::formatted("frame at {}ms", timestamp().to_milliseconds());
}
private: