From 2df57d5ae07d4be8842a2ca79293a3a8ee9bddd2 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 21 Dec 2022 20:13:19 +0000 Subject: [PATCH] SystemMonitor: Replace uses of JsonObject::get_deprecated()/get_ptr() --- Userland/Applications/SystemMonitor/main.cpp | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Userland/Applications/SystemMonitor/main.cpp b/Userland/Applications/SystemMonitor/main.cpp index f08193c628..7f16f626fa 100644 --- a/Userland/Applications/SystemMonitor/main.cpp +++ b/Userland/Applications/SystemMonitor/main.cpp @@ -127,53 +127,53 @@ public: df_fields.empend("source", "Source", Gfx::TextAlignment::CenterLeft); df_fields.empend( "Size", Gfx::TextAlignment::CenterRight, - [](const JsonObject& object) { + [](JsonObject const& object) { StringBuilder size_builder; size_builder.append(' '); - size_builder.append(human_readable_size(object.get_deprecated("total_block_count"sv).to_u64() * object.get_deprecated("block_size"sv).to_u64())); + size_builder.append(human_readable_size(object.get_u64("total_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0))); size_builder.append(' '); return size_builder.to_deprecated_string(); }, - [](const JsonObject& object) { - return object.get_deprecated("total_block_count"sv).to_u64() * object.get_deprecated("block_size"sv).to_u64(); + [](JsonObject const& object) { + return object.get_u64("total_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0); }, - [](const JsonObject& object) { - auto total_blocks = object.get_deprecated("total_block_count"sv).to_u64(); + [](JsonObject const& object) { + auto total_blocks = object.get_u64("total_block_count"sv).value_or(0); if (total_blocks == 0) return 0; - auto free_blocks = object.get_deprecated("free_block_count"sv).to_u64(); + auto free_blocks = object.get_u64("free_block_count"sv).value_or(0); auto used_blocks = total_blocks - free_blocks; int percentage = (static_cast(used_blocks) / static_cast(total_blocks) * 100.0); return percentage; }); df_fields.empend( "Used", Gfx::TextAlignment::CenterRight, - [](const JsonObject& object) { - auto total_blocks = object.get_deprecated("total_block_count"sv).to_u64(); - auto free_blocks = object.get_deprecated("free_block_count"sv).to_u64(); + [](JsonObject const& object) { + auto total_blocks = object.get_u64("total_block_count"sv).value_or(0); + auto free_blocks = object.get_u64("free_block_count"sv).value_or(0); auto used_blocks = total_blocks - free_blocks; - return human_readable_size(used_blocks * object.get_deprecated("block_size"sv).to_u64()); }, - [](const JsonObject& object) { - auto total_blocks = object.get_deprecated("total_block_count"sv).to_u64(); - auto free_blocks = object.get_deprecated("free_block_count"sv).to_u64(); + return human_readable_size(used_blocks * object.get_u64("block_size"sv).value_or(0)); }, + [](JsonObject const& object) { + auto total_blocks = object.get_u64("total_block_count"sv).value_or(0); + auto free_blocks = object.get_u64("free_block_count"sv).value_or(0); auto used_blocks = total_blocks - free_blocks; - return used_blocks * object.get_deprecated("block_size"sv).to_u64(); + return used_blocks * object.get_u64("block_size"sv).value_or(0); }); df_fields.empend( "Available", Gfx::TextAlignment::CenterRight, - [](const JsonObject& object) { - return human_readable_size(object.get_deprecated("free_block_count"sv).to_u64() * object.get_deprecated("block_size"sv).to_u64()); + [](JsonObject const& object) { + return human_readable_size(object.get_u64("free_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0)); }, - [](const JsonObject& object) { - return object.get_deprecated("free_block_count"sv).to_u64() * object.get_deprecated("block_size"sv).to_u64(); + [](JsonObject const& object) { + return object.get_u64("free_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0); }); - df_fields.empend("Access", Gfx::TextAlignment::CenterLeft, [](const JsonObject& object) { - bool readonly = object.get_deprecated("readonly"sv).to_bool(); - int mount_flags = object.get_deprecated("mount_flags"sv).to_int(); + df_fields.empend("Access", Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) { + bool readonly = object.get_bool("readonly"sv).value_or(false); + int mount_flags = object.get_i32("mount_flags"sv).value_or(0); return readonly || (mount_flags & MS_RDONLY) ? "Read-only" : "Read/Write"; }); - df_fields.empend("Mount flags", Gfx::TextAlignment::CenterLeft, [](const JsonObject& object) { - int mount_flags = object.get_deprecated("mount_flags"sv).to_int(); + df_fields.empend("Mount flags", Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) { + int mount_flags = object.get_i32("mount_flags"sv).value_or(0); StringBuilder builder; bool first = true; auto check = [&](int flag, StringView name) {