mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 23:47:45 +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:
parent
f74251606d
commit
6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
|
@ -20,14 +20,14 @@ enum class Version {
|
|||
};
|
||||
|
||||
struct Doctype {
|
||||
String type;
|
||||
DeprecatedString type;
|
||||
Vector<MarkupDeclaration> markup_declarations;
|
||||
Optional<ExternalID> external_id;
|
||||
};
|
||||
|
||||
class Document {
|
||||
public:
|
||||
explicit Document(NonnullOwnPtr<Node> root, Optional<Doctype> doctype, HashMap<Name, String> processing_instructions, Version version)
|
||||
explicit Document(NonnullOwnPtr<Node> root, Optional<Doctype> doctype, HashMap<Name, DeprecatedString> processing_instructions, Version version)
|
||||
: m_root(move(root))
|
||||
, m_processing_instructions(move(processing_instructions))
|
||||
, m_version(version)
|
||||
|
@ -38,7 +38,7 @@ public:
|
|||
Node& root() { return *m_root; }
|
||||
Node const& root() const { return *m_root; }
|
||||
|
||||
HashMap<Name, String> const& processing_instructions() const { return m_processing_instructions; }
|
||||
HashMap<Name, DeprecatedString> const& processing_instructions() const { return m_processing_instructions; }
|
||||
|
||||
Version version() const { return m_version; }
|
||||
|
||||
|
@ -46,7 +46,7 @@ public:
|
|||
|
||||
private:
|
||||
NonnullOwnPtr<Node> m_root;
|
||||
HashMap<Name, String> m_processing_instructions;
|
||||
HashMap<Name, DeprecatedString> m_processing_instructions;
|
||||
Version m_version;
|
||||
Optional<Doctype> m_explicit_doctype;
|
||||
};
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/HashTable.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/Variant.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibXML/FundamentalTypes.h>
|
||||
|
@ -73,7 +73,7 @@ struct AttributeListDeclaration {
|
|||
};
|
||||
struct Enumeration {
|
||||
// FIXME: NMToken
|
||||
HashTable<String> tokens;
|
||||
HashTable<DeprecatedString> tokens;
|
||||
};
|
||||
using Type = Variant<StringType, TokenizedType, NotationType, Enumeration>;
|
||||
|
||||
|
@ -82,10 +82,10 @@ struct AttributeListDeclaration {
|
|||
struct Implied {
|
||||
};
|
||||
struct Fixed {
|
||||
String value;
|
||||
DeprecatedString value;
|
||||
};
|
||||
struct DefaultValue {
|
||||
String value;
|
||||
DeprecatedString value;
|
||||
};
|
||||
|
||||
using Default = Variant<Required, Implied, Fixed, DefaultValue>;
|
||||
|
@ -100,11 +100,11 @@ struct AttributeListDeclaration {
|
|||
};
|
||||
|
||||
struct PublicID {
|
||||
String public_literal;
|
||||
DeprecatedString public_literal;
|
||||
};
|
||||
|
||||
struct SystemID {
|
||||
String system_literal;
|
||||
DeprecatedString system_literal;
|
||||
};
|
||||
|
||||
struct ExternalID {
|
||||
|
@ -119,12 +119,12 @@ struct EntityDefinition {
|
|||
|
||||
struct GEDeclaration {
|
||||
Name name;
|
||||
Variant<String, EntityDefinition> definition;
|
||||
Variant<DeprecatedString, EntityDefinition> definition;
|
||||
};
|
||||
|
||||
struct PEDeclaration {
|
||||
Name name;
|
||||
Variant<String, ExternalID> definition;
|
||||
Variant<DeprecatedString, ExternalID> definition;
|
||||
};
|
||||
|
||||
using EntityDeclaration = Variant<GEDeclaration, PEDeclaration>;
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <AK/NonnullOwnPtrVector.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/Variant.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibXML/FundamentalTypes.h>
|
||||
|
@ -17,7 +17,7 @@ namespace XML {
|
|||
|
||||
struct Attribute {
|
||||
Name name;
|
||||
String value;
|
||||
DeprecatedString value;
|
||||
};
|
||||
|
||||
struct Node {
|
||||
|
@ -25,11 +25,11 @@ struct Node {
|
|||
StringBuilder builder;
|
||||
};
|
||||
struct Comment {
|
||||
String text;
|
||||
DeprecatedString text;
|
||||
};
|
||||
struct Element {
|
||||
Name name;
|
||||
HashMap<Name, String> attributes;
|
||||
HashMap<Name, DeprecatedString> attributes;
|
||||
NonnullOwnPtrVector<Node> children;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue