RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 10: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/Applications/Spreadsheet/Readers/XSV.cpp
View file

@ -25,9 +25,9 @@ void XSV::set_error(ReadError error)
m_error = error;
}
Vector<DeprecatedString> XSV::headers() const
Vector<ByteString> XSV::headers() const
{
Vector<DeprecatedString> headers;
Vector<ByteString> headers;
if (has_explicit_headers()) {
for (auto& field : m_names)
headers.append(field.is_string_view ? field.as_string_view : field.as_string.view());
@ -37,7 +37,7 @@ Vector<DeprecatedString> XSV::headers() const
return headers;
for ([[maybe_unused]] auto& field : m_rows.first())
headers.append(DeprecatedString::empty());
headers.append(ByteString::empty());
}
return headers;
@ -240,7 +240,7 @@ XSV::Field XSV::read_one_quoted_field()
set_error(ReadError::QuoteFailure);
if (is_copy)
return { {}, builder.to_deprecated_string(), false };
return { {}, builder.to_byte_string(), false };
return { m_source.substring_view(start, end - start), {}, true };
}

12
Userland/Applications/Spreadsheet/Readers/XSV.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/ByteString.h>
#include <AK/GenericLexer.h>
#include <AK/StringView.h>
#include <AK/Types.h>
@ -31,8 +31,8 @@ ParserBehavior operator&(ParserBehavior left, ParserBehavior right);
ParserBehavior operator|(ParserBehavior left, ParserBehavior right);
struct ParserTraits {
DeprecatedString separator;
DeprecatedString quote { "\"" };
ByteString separator;
ByteString quote { "\"" };
enum QuoteEscape {
Repeat,
Backslash,
@ -73,7 +73,7 @@ public:
void parse();
bool has_error() const { return m_error != ReadError::None; }
ReadError error() const { return m_error; }
DeprecatedString error_string() const
ByteString error_string() const
{
switch (m_error) {
#define E(x, y) \
@ -87,7 +87,7 @@ public:
}
size_t size() const { return m_rows.size(); }
Vector<DeprecatedString> headers() const;
Vector<ByteString> headers() const;
[[nodiscard]] bool has_explicit_headers() const { return (static_cast<u32>(m_behaviors) & static_cast<u32>(ParserBehavior::ReadHeaders)) != 0; }
class Row {
@ -185,7 +185,7 @@ public:
private:
struct Field {
StringView as_string_view;
DeprecatedString as_string; // This member only used if the parser couldn't use the original source verbatim.
ByteString as_string; // This member only used if the parser couldn't use the original source verbatim.
bool is_string_view { true };
bool operator==(StringView other) const