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

AK: Replace uses of JsonObject::get_deprecated()/get_ptr()

Browse source
This commit is contained in:
Sam Atkins 2022-12-21 14:37:12 +00:00 • committed by Tim Flynn
parent 8d3b268cca
commit 79547896b7
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AK/JsonPath.cpp
View file

@ -19,7 +19,7 @@ JsonValue JsonPath::resolve(JsonValue const& top_root) const
for (auto const& element : *this) { for (auto const& element : *this) {
switch (element.kind()) { switch (element.kind()) {
case JsonPathElement::Kind::Key: case JsonPathElement::Kind::Key:
root = JsonValue { root.as_object().get_deprecated(element.key()) }; root = JsonValue { root.as_object().get(element.key()).value() };
break; break;
case JsonPathElement::Kind::Index: case JsonPathElement::Kind::Index:
root = JsonValue { root.as_array().at(element.index()) }; root = JsonValue { root.as_array().at(element.index()) };

6
AK/JsonValue.cpp
View file

@ -103,7 +103,11 @@ bool JsonValue::equals(JsonValue const& other) const
if (is_object() && other.is_object() && as_object().size() == other.as_object().size()) { if (is_object() && other.is_object() && as_object().size() == other.as_object().size()) {
bool result = true; bool result = true;
as_object().for_each_member([&](auto& key, auto& value) { as_object().for_each_member([&](auto& key, auto& value) {
result &= value.equals(other.as_object().get_deprecated(key)); auto other_value = other.as_object().get(key);
if (other_value.has_value())
result &= value.equals(*other_value);
else
result = false;
}); });
return result; return result;
} }