mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 11:27:34 +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,9 +6,9 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/GenericLexer.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/StringBuilder.h>
|
||||
|
||||
namespace AK {
|
||||
|
@ -17,7 +17,7 @@ class SourceGenerator {
|
|||
AK_MAKE_NONCOPYABLE(SourceGenerator);
|
||||
|
||||
public:
|
||||
using MappingType = HashMap<StringView, String>;
|
||||
using MappingType = HashMap<StringView, DeprecatedString>;
|
||||
|
||||
explicit SourceGenerator(StringBuilder& builder, char opening = '@', char closing = '@')
|
||||
: m_builder(builder)
|
||||
|
@ -37,7 +37,7 @@ public:
|
|||
|
||||
SourceGenerator fork() { return SourceGenerator { m_builder, m_mapping, m_opening, m_closing }; }
|
||||
|
||||
void set(StringView key, String value)
|
||||
void set(StringView key, DeprecatedString value)
|
||||
{
|
||||
if (key.contains(m_opening) || key.contains(m_closing)) {
|
||||
warnln("SourceGenerator keys cannot contain the opening/closing delimiters `{}` and `{}`. (Keys are only wrapped in these when using them, not when setting them.)", m_opening, m_closing);
|
||||
|
@ -46,7 +46,7 @@ public:
|
|||
m_mapping.set(key, move(value));
|
||||
}
|
||||
|
||||
String get(StringView key) const
|
||||
DeprecatedString get(StringView key) const
|
||||
{
|
||||
auto result = m_mapping.get(key);
|
||||
if (!result.has_value()) {
|
||||
|
@ -57,7 +57,7 @@ public:
|
|||
}
|
||||
|
||||
StringView as_string_view() const { return m_builder.string_view(); }
|
||||
String as_string() const { return m_builder.build(); }
|
||||
DeprecatedString as_string() const { return m_builder.build(); }
|
||||
|
||||
void append(StringView pattern)
|
||||
{
|
||||
|
@ -92,13 +92,13 @@ public:
|
|||
}
|
||||
|
||||
template<size_t N>
|
||||
String get(char const (&key)[N])
|
||||
DeprecatedString get(char const (&key)[N])
|
||||
{
|
||||
return get(StringView { key, N - 1 });
|
||||
}
|
||||
|
||||
template<size_t N>
|
||||
void set(char const (&key)[N], String value)
|
||||
void set(char const (&key)[N], DeprecatedString value)
|
||||
{
|
||||
set(StringView { key, N - 1 }, value);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue