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

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 :^)
This commit is contained in:
Linus Groh 2022-12-04 18:02:33 +00:00 committed by Andreas Kling
parent f74251606d
commit 6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions

View file

@ -12,7 +12,7 @@
namespace DNS {
Answer::Answer(Name const& name, RecordType type, RecordClass class_code, u32 ttl, String const& record_data, bool mdns_cache_flush)
Answer::Answer(Name const& name, RecordType type, RecordClass class_code, u32 ttl, DeprecatedString const& record_data, bool mdns_cache_flush)
: m_name(name)
, m_type(type)
, m_class_code(class_code)
@ -110,14 +110,14 @@ bool encode(Encoder& encoder, DNS::Answer const& answer)
template<>
ErrorOr<void> decode(Decoder& decoder, DNS::Answer& answer)
{
String name;
DeprecatedString name;
TRY(decoder.decode(name));
u16 record_type, class_code;
TRY(decoder.decode(record_type));
TRY(decoder.decode(class_code));
u32 ttl;
TRY(decoder.decode(ttl));
String record_data;
DeprecatedString record_data;
TRY(decoder.decode(record_data));
bool cache_flush;
TRY(decoder.decode(cache_flush));

View file

@ -7,8 +7,8 @@
#pragma once
#include "Name.h"
#include <AK/DeprecatedString.h>
#include <AK/Format.h>
#include <AK/String.h>
#include <AK/Traits.h>
#include <AK/Types.h>
#include <LibIPC/Forward.h>
@ -36,7 +36,7 @@ enum class RecordClass : u16 {
class Answer {
public:
Answer() = default;
Answer(Name const& name, RecordType type, RecordClass class_code, u32 ttl, String const& record_data, bool mdns_cache_flush);
Answer(Name const& name, RecordType type, RecordClass class_code, u32 ttl, DeprecatedString const& record_data, bool mdns_cache_flush);
Name const& name() const { return m_name; }
RecordType type() const { return m_type; }
@ -44,7 +44,7 @@ public:
u16 raw_class_code() const { return (u16)m_class_code | (m_mdns_cache_flush ? MDNS_CACHE_FLUSH : 0); }
u32 ttl() const { return m_ttl; }
time_t received_time() const { return m_received_time; }
String const& record_data() const { return m_record_data; }
DeprecatedString const& record_data() const { return m_record_data; }
bool mdns_cache_flush() const { return m_mdns_cache_flush; }
bool has_expired() const;
@ -58,7 +58,7 @@ private:
RecordClass m_class_code { 0 };
u32 m_ttl { 0 };
time_t m_received_time { 0 };
String m_record_data;
DeprecatedString m_record_data;
bool m_mdns_cache_flush { false };
};

View file

@ -12,7 +12,7 @@
namespace DNS {
Name::Name(String const& name)
Name::Name(DeprecatedString const& name)
{
if (name.ends_with('.'))
m_name = name.substring(0, name.length() - 1);

View file

@ -7,20 +7,20 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/Forward.h>
#include <AK/String.h>
namespace DNS {
class Name {
public:
Name() = default;
Name(String const&);
Name(DeprecatedString const&);
static Name parse(u8 const* data, size_t& offset, size_t max_offset, size_t recursion_level = 0);
size_t serialized_size() const;
String const& as_string() const { return m_name; }
DeprecatedString const& as_string() const { return m_name; }
void randomize_case();
@ -33,7 +33,7 @@ public:
};
private:
String m_name;
DeprecatedString m_name;
};
OutputStream& operator<<(OutputStream& stream, Name const&);

View file

@ -141,7 +141,7 @@ Optional<Packet> Packet::from_raw_packet(u8 const* raw_data, size_t raw_size)
auto& record = *(DNSRecordWithoutName const*)(&raw_data[offset]);
String data;
DeprecatedString data;
offset += sizeof(DNSRecordWithoutName);