diff --git a/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp b/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp index eca1858251..75b187615c 100644 --- a/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp +++ b/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp @@ -56,8 +56,8 @@ ErrorOr CommonLocationsProvider::load_from_json(StringView json_path) if (!entry_value.is_object()) continue; auto entry = entry_value.as_object(); - auto name = entry.get_deprecated("name"sv).to_deprecated_string(); - auto path = entry.get_deprecated("path"sv).to_deprecated_string(); + auto name = entry.get_deprecated_string("name"sv).value_or({}); + auto path = entry.get_deprecated_string("path"sv).value_or({}); TRY(s_common_locations.try_append({ name, path })); } diff --git a/Userland/Libraries/LibGUI/JsonArrayModel.cpp b/Userland/Libraries/LibGUI/JsonArrayModel.cpp index 10755014a3..cedb394b99 100644 --- a/Userland/Libraries/LibGUI/JsonArrayModel.cpp +++ b/Userland/Libraries/LibGUI/JsonArrayModel.cpp @@ -119,12 +119,14 @@ Variant JsonArrayModel::data(ModelIndex const& index, ModelRole role) const if (role == ModelRole::Display) { auto& json_field_name = field_spec.json_field_name; - auto data = object.get_deprecated(json_field_name); + auto data = object.get(json_field_name); if (field_spec.massage_for_display) return field_spec.massage_for_display(object); - if (data.is_number()) - return data; - return object.get_deprecated(json_field_name).to_deprecated_string(); + if (!data.has_value()) + return ""; + if (data->is_number()) + return data.value(); + return data->to_deprecated_string(); } if (role == ModelRole::Sort) { diff --git a/Userland/Libraries/LibGUI/UIDimensions.h b/Userland/Libraries/LibGUI/UIDimensions.h index dfb0388dcc..6c40d006cd 100644 --- a/Userland/Libraries/LibGUI/UIDimensions.h +++ b/Userland/Libraries/LibGUI/UIDimensions.h @@ -306,9 +306,9 @@ inline auto clamp(GUI::UIDimension const& input, GUI::UIDimens if (!value.is_object()) \ return false; \ auto result_width = GUI::UIDimension::construct_from_json_value( \ - value.as_object().get_deprecated("width"sv)); \ + value.as_object().get("width"sv).value_or({})); \ auto result_height = GUI::UIDimension::construct_from_json_value( \ - value.as_object().get_deprecated("height"sv)); \ + value.as_object().get("height"sv).value_or({})); \ if (result_width.has_value() && result_height.has_value()) { \ GUI::UISize size(result_width.value(), result_height.value()); \ setter(size); \