RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:57:35 +00:00
Code Issues Activity Actions

Everywhere: Add deprecated_ prefix to JsonValue::to_byte_string

Browse source 
`JsonValue::to_byte_string` has peculiar type-erasure semantics which is
not usually intended. Unfortunately, it also has a very stereotypical
name which does not warn about unexpected behavior. So let's prefix it
with `deprecated_` to make new code use `as_string` if it just wants to
get string value or `serialized<StringBuilder>` if it needs to do proper
serialization.
This commit is contained in:
Dan Klishch 2024-01-06 15:49:17 -05:00 • committed by Andrew Kaster
parent 4ed5287792
commit ccd701809f
20 changed files with 46 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Applications/Presenter/Presentation.cpp
View file

@ -133,7 +133,8 @@ HashMap<ByteString, ByteString> Presentation::parse_metadata(JsonObject const& m
HashMap<ByteString, ByteString> metadata;
metadata_object.for_each_member([&](auto const& key, auto const& value) {
metadata.set(key, value.to_byte_string());
// FIXME: Do not serialize values here just to convert them back to proper types later.
metadata.set(key, value.deprecated_to_byte_string());
});
return metadata;

16
Userland/Applications/Presenter/SlideObject.cpp
View file

@ -58,7 +58,7 @@ void SlideObject::set_property(StringView name, JsonValue value)
void GraphicsObject::set_property(StringView name, JsonValue value)
{
if (name == "color"sv) {
if (auto color = Gfx::Color::from_string(value.to_byte_string()); color.has_value()) {
if (auto color = Gfx::Color::from_string(value.as_string()); color.has_value()) {
m_color = color.release_value();
}
}
@ -68,15 +68,15 @@ void GraphicsObject::set_property(StringView name, JsonValue value)
void Text::set_property(StringView name, JsonValue value)
{
if (name == "text"sv) {
m_text = value.to_byte_string();
m_text = value.as_string();
} else if (name == "font"sv) {
m_font_family = value.to_byte_string();
m_font_family = value.as_string();
} else if (name == "font-weight"sv) {
m_font_weight = Gfx::name_to_weight(value.to_byte_string());
m_font_weight = Gfx::name_to_weight(value.as_string());
} else if (name == "font-size"sv) {
m_font_size_in_pt = value.to_float();
} else if (name == "text-alignment"sv) {
m_text_align = value.to_byte_string();
m_text_align = value.as_string();
}
GraphicsObject::set_property(name, move(value));
}
@ -84,11 +84,11 @@ void Text::set_property(StringView name, JsonValue value)
void Image::set_property(StringView name, JsonValue value)
{
if (name == "path"sv) {
m_src = value.to_byte_string();
m_src = value.as_string();
} else if (name == "scaling-mode"sv) {
if (value.to_byte_string() == "nearest-neighbor"sv)
if (value.as_string() == "nearest-neighbor"sv)
m_image_rendering = "crisp-edges"sv;
else if (value.to_byte_string() == "smooth-pixels"sv)
else if (value.as_string() == "smooth-pixels"sv)
m_image_rendering = "pixelated"sv;
}
SlideObject::set_property(name, move(value));

8
Userland/Applications/Spreadsheet/HelpWindow.cpp
View file

@ -166,7 +166,7 @@ ByteString HelpWindow::render(StringView key)
markdown_builder.append("No required arguments.\n"sv);
for (size_t i = 0; i < argc; ++i)
markdown_builder.appendff("- `{}`\n", argnames.at(i).to_byte_string());
markdown_builder.appendff("- `{}`\n", argnames.at(i).as_string());
if (argc > 0)
markdown_builder.append("\n"sv);
@ -175,7 +175,7 @@ ByteString HelpWindow::render(StringView key)
auto opt_count = argnames.size() - argc;
markdown_builder.appendff("{} optional argument(s):\n", opt_count);
for (size_t i = argc; i < (size_t)argnames.size(); ++i)
markdown_builder.appendff("- `{}`\n", argnames.at(i).to_byte_string());
markdown_builder.appendff("- `{}`\n", argnames.at(i).as_string());
markdown_builder.append("\n"sv);
}
@ -188,8 +188,8 @@ ByteString HelpWindow::render(StringView key)
VERIFY(examples.has_value());
markdown_builder.append("# EXAMPLES\n"sv);
examples->for_each_member([&](auto& text, auto& description_value) {
dbgln("```js\n{}\n```\n\n- {}\n", text, description_value.to_byte_string());
markdown_builder.appendff("```js\n{}\n```\n\n- {}\n", text, description_value.to_byte_string());
dbgln("```js\n{}\n```\n\n- {}\n", text, description_value.as_string());
markdown_builder.appendff("```js\n{}\n```\n\n- {}\n", text, description_value.as_string());
});
}

2
Userland/Applications/Spreadsheet/Spreadsheet.cpp
View file

@ -731,7 +731,7 @@ ByteString Sheet::generate_inline_documentation_for(StringView function, size_t
builder.append('<');
else if (i >= argc)
builder.append('[');
builder.append(argnames[i].to_byte_string());
builder.append(argnames[i].as_string());
if (i == argument_index)
builder.append('>');
else if (i >= argc)