mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 04:57: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
|
@ -6,7 +6,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Types.h>
|
||||
#include <AK/Vector.h>
|
||||
|
||||
|
@ -34,7 +34,7 @@ public:
|
|||
}
|
||||
|
||||
Kind kind() const { return m_kind; }
|
||||
String const& key() const
|
||||
DeprecatedString const& key() const
|
||||
{
|
||||
VERIFY(m_kind == Kind::Key);
|
||||
return m_key;
|
||||
|
@ -46,13 +46,13 @@ public:
|
|||
return m_index;
|
||||
}
|
||||
|
||||
String to_string() const
|
||||
DeprecatedString to_string() const
|
||||
{
|
||||
switch (m_kind) {
|
||||
case Kind::Key:
|
||||
return key();
|
||||
case Kind::Index:
|
||||
return String::number(index());
|
||||
return DeprecatedString::number(index());
|
||||
default:
|
||||
return "*";
|
||||
}
|
||||
|
@ -78,7 +78,7 @@ public:
|
|||
|
||||
private:
|
||||
Kind m_kind;
|
||||
String m_key;
|
||||
DeprecatedString m_key;
|
||||
size_t m_index { 0 };
|
||||
|
||||
JsonPathElement(Kind kind)
|
||||
|
@ -90,7 +90,7 @@ private:
|
|||
class JsonPath : public Vector<JsonPathElement> {
|
||||
public:
|
||||
JsonValue resolve(JsonValue const&) const;
|
||||
String to_string() const;
|
||||
DeprecatedString to_string() const;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue