mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 19:37:35 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -68,16 +68,16 @@ static bool is_ui_dimension_property(StringView property)
|
|||
}
|
||||
|
||||
// FIXME: Since normal string-based properties take either String or StringView (and the latter can be implicitly constructed from the former),
|
||||
// we need to special-case DeprecatedString property setters while those still exist.
|
||||
// we need to special-case ByteString property setters while those still exist.
|
||||
// Please remove a setter from this list once it uses StringView or String.
|
||||
static bool takes_deprecated_string(StringView property)
|
||||
static bool takes_byte_string(StringView property)
|
||||
{
|
||||
static HashTable<StringView> deprecated_string_properties;
|
||||
if (deprecated_string_properties.is_empty()) {
|
||||
deprecated_string_properties.set("icon_from_path"sv);
|
||||
deprecated_string_properties.set("name"sv);
|
||||
static HashTable<StringView> byte_string_properties;
|
||||
if (byte_string_properties.is_empty()) {
|
||||
byte_string_properties.set("icon_from_path"sv);
|
||||
byte_string_properties.set("name"sv);
|
||||
}
|
||||
return deprecated_string_properties.contains(property);
|
||||
return byte_string_properties.contains(property);
|
||||
}
|
||||
|
||||
static ErrorOr<String> include_path_for(StringView class_name, LexicalPath const& gml_file_name)
|
||||
|
@ -141,7 +141,7 @@ static char const footer[] = R"~~~(
|
|||
|
||||
static ErrorOr<String> escape_string(JsonValue to_escape)
|
||||
{
|
||||
auto string = TRY(String::from_deprecated_string(to_escape.as_string()));
|
||||
auto string = TRY(String::from_byte_string(to_escape.as_string()));
|
||||
|
||||
// All C++ simple escape sequences; see https://en.cppreference.com/w/cpp/language/escape
|
||||
// Other commonly-escaped characters are hard-to-type Unicode and therefore fine to include verbatim in UTF-8 coded strings.
|
||||
|
@ -194,7 +194,7 @@ static ErrorOr<String> generate_initializer_for(Optional<StringView> property_na
|
|||
{
|
||||
if (value.is_string()) {
|
||||
if (property_name.has_value()) {
|
||||
if (takes_deprecated_string(*property_name))
|
||||
if (takes_byte_string(*property_name))
|
||||
return String::formatted(R"~~~("{}"sv)~~~", TRY(escape_string(value)));
|
||||
|
||||
if (auto const enum_value = TRY(generate_enum_initializer_for(*property_name, value)); enum_value.has_value())
|
||||
|
@ -252,7 +252,7 @@ static ErrorOr<String> generate_initializer_for(Optional<StringView> property_na
|
|||
// All loading happens in a separate block.
|
||||
static ErrorOr<void> generate_loader_for_object(GUI::GML::Object const& gml_object, SourceGenerator generator, String object_name, size_t indentation, UseObjectConstructor use_object_constructor)
|
||||
{
|
||||
generator.set("object_name", object_name.to_deprecated_string());
|
||||
generator.set("object_name", object_name.to_byte_string());
|
||||
generator.set("class_name", gml_object.name());
|
||||
|
||||
auto append = [&]<size_t N>(auto& generator, char const(&text)[N]) -> ErrorOr<void> {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue