mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 12:27:35 +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
|
@ -11,7 +11,7 @@
|
|||
#include <AK/StringBuilder.h>
|
||||
|
||||
#ifndef KERNEL
|
||||
# include <AK/String.h>
|
||||
# include <AK/DeprecatedString.h>
|
||||
#endif
|
||||
|
||||
namespace AK {
|
||||
|
@ -58,7 +58,7 @@ public:
|
|||
JsonValue(bool);
|
||||
JsonValue(char const*);
|
||||
#ifndef KERNEL
|
||||
JsonValue(String const&);
|
||||
JsonValue(DeprecatedString const&);
|
||||
#endif
|
||||
JsonValue(StringView);
|
||||
JsonValue(JsonArray const&);
|
||||
|
@ -77,14 +77,14 @@ public:
|
|||
void serialize(Builder&) const;
|
||||
|
||||
#ifndef KERNEL
|
||||
String as_string_or(String const& alternative) const
|
||||
DeprecatedString as_string_or(DeprecatedString const& alternative) const
|
||||
{
|
||||
if (is_string())
|
||||
return as_string();
|
||||
return alternative;
|
||||
}
|
||||
|
||||
String to_string() const
|
||||
DeprecatedString to_string() const
|
||||
{
|
||||
if (is_string())
|
||||
return as_string();
|
||||
|
@ -157,7 +157,7 @@ public:
|
|||
}
|
||||
|
||||
#ifndef KERNEL
|
||||
String as_string() const
|
||||
DeprecatedString as_string() const
|
||||
{
|
||||
VERIFY(is_string());
|
||||
return *m_value.as_string;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue