RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 09:47:34 +00:00
Code Issues Activity Actions

AK+Everywhere: Rename JsonObject::get() to ::get_deprecated()

Browse source 
This is a preparatory step to making `get()` return `ErrorOr`.
This commit is contained in:
Sam Atkins 2022-12-21 11:42:06 +00:00 • committed by Tim Flynn
parent efe4329f9f
commit 1dd6b7f5b7
76 changed files with 671 additions and 671 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/DevTools/HackStudio/ProjectConfig.cpp
View file

@ -35,7 +35,7 @@ NonnullOwnPtr<ProjectConfig> ProjectConfig::create_empty()
Optional<DeprecatedString> ProjectConfig::read_key(DeprecatedString key_name) const
{
auto const& value = m_config.get(key_name);
auto const& value = m_config.get_deprecated(key_name);
if (!value.is_string())
return {};

14
Userland/DevTools/Inspector/RemoteProcess.cpp
View file

@ -28,10 +28,10 @@ RemoteProcess::RemoteProcess(pid_t pid)
void RemoteProcess::handle_identify_response(JsonObject const& response)
{
int pid = response.get("pid"sv).to_int();
int pid = response.get_deprecated("pid"sv).to_int();
VERIFY(pid == m_pid);
m_process_name = response.get("process_name"sv).as_string_or({});
m_process_name = response.get_deprecated("process_name"sv).as_string_or({});
if (on_update)
on_update();
@ -40,7 +40,7 @@ void RemoteProcess::handle_identify_response(JsonObject const& response)
void RemoteProcess::handle_get_all_objects_response(JsonObject const& response)
{
// FIXME: It would be good if we didn't have to make a local copy of the array value here!
auto objects = response.get("objects"sv);
auto objects = response.get_deprecated("objects"sv);
auto& object_array = objects.as_array();
NonnullOwnPtrVector<RemoteObject> remote_objects;
@ -50,10 +50,10 @@ void RemoteProcess::handle_get_all_objects_response(JsonObject const& response)
VERIFY(value.is_object());
auto& object = value.as_object();
auto remote_object = make<RemoteObject>();
remote_object->address = object.get("address"sv).to_number<FlatPtr>();
remote_object->parent_address = object.get("parent"sv).to_number<FlatPtr>();
remote_object->name = object.get("name"sv).to_deprecated_string();
remote_object->class_name = object.get("class_name"sv).to_deprecated_string();
remote_object->address = object.get_deprecated("address"sv).to_number<FlatPtr>();
remote_object->parent_address = object.get_deprecated("parent"sv).to_number<FlatPtr>();
remote_object->name = object.get_deprecated("name"sv).to_deprecated_string();
remote_object->class_name = object.get_deprecated("class_name"sv).to_deprecated_string();
remote_object->json = object;
objects_by_address.set(remote_object->address, remote_object);
remote_objects.append(move(remote_object));

48
Userland/DevTools/Profiler/Profile.cpp
View file

@ -281,34 +281,34 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
event.serial = next_serial;
next_serial.increment();
event.timestamp = perf_event.get("timestamp"sv).to_number<u64>();
event.lost_samples = perf_event.get("lost_samples"sv).to_number<u32>();
event.pid = perf_event.get("pid"sv).to_i32();
event.tid = perf_event.get("tid"sv).to_i32();
event.timestamp = perf_event.get_deprecated("timestamp"sv).to_number<u64>();
event.lost_samples = perf_event.get_deprecated("lost_samples"sv).to_number<u32>();
event.pid = perf_event.get_deprecated("pid"sv).to_i32();
event.tid = perf_event.get_deprecated("tid"sv).to_i32();
auto type_string = perf_event.get("type"sv).to_deprecated_string();
auto type_string = perf_event.get_deprecated("type"sv).to_deprecated_string();
if (type_string == "sample"sv) {
event.data = Event::SampleData {};
} else if (type_string == "malloc"sv) {
event.data = Event::MallocData {
.ptr = perf_event.get("ptr"sv).to_number<FlatPtr>(),
.size = perf_event.get("size"sv).to_number<size_t>(),
.ptr = perf_event.get_deprecated("ptr"sv).to_number<FlatPtr>(),
.size = perf_event.get_deprecated("size"sv).to_number<size_t>(),
};
} else if (type_string == "free"sv) {
event.data = Event::FreeData {
.ptr = perf_event.get("ptr"sv).to_number<FlatPtr>(),
.ptr = perf_event.get_deprecated("ptr"sv).to_number<FlatPtr>(),
};
} else if (type_string == "signpost"sv) {
auto string_id = perf_event.get("arg1"sv).to_number<FlatPtr>();
auto string_id = perf_event.get_deprecated("arg1"sv).to_number<FlatPtr>();
event.data = Event::SignpostData {
.string = profile_strings.get(string_id).value_or(DeprecatedString::formatted("Signpost #{}", string_id)),
.arg = perf_event.get("arg2"sv).to_number<FlatPtr>(),
.arg = perf_event.get_deprecated("arg2"sv).to_number<FlatPtr>(),
};
} else if (type_string == "mmap"sv) {
auto ptr = perf_event.get("ptr"sv).to_number<FlatPtr>();
auto size = perf_event.get("size"sv).to_number<size_t>();
auto name = perf_event.get("name"sv).to_deprecated_string();
auto ptr = perf_event.get_deprecated("ptr"sv).to_number<FlatPtr>();
auto size = perf_event.get_deprecated("size"sv).to_number<size_t>();
auto name = perf_event.get_deprecated("name"sv).to_deprecated_string();
event.data = Event::MmapData {
.ptr = ptr,
@ -322,13 +322,13 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
continue;
} else if (type_string == "munmap"sv) {
event.data = Event::MunmapData {
.ptr = perf_event.get("ptr"sv).to_number<FlatPtr>(),
.size = perf_event.get("size"sv).to_number<size_t>(),
.ptr = perf_event.get_deprecated("ptr"sv).to_number<FlatPtr>(),
.size = perf_event.get_deprecated("size"sv).to_number<size_t>(),
};
continue;
} else if (type_string == "process_create"sv) {
auto parent_pid = perf_event.get("parent_pid"sv).to_number<pid_t>();
auto executable = perf_event.get("executable"sv).to_deprecated_string();
auto parent_pid = perf_event.get_deprecated("parent_pid"sv).to_number<pid_t>();
auto executable = perf_event.get_deprecated("executable"sv).to_deprecated_string();
event.data = Event::ProcessCreateData {
.parent_pid = parent_pid,
.executable = executable,
@ -346,7 +346,7 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
all_processes.append(move(sampled_process));
continue;
} else if (type_string == "process_exec"sv) {
auto executable = perf_event.get("executable"sv).to_deprecated_string();
auto executable = perf_event.get_deprecated("executable"sv).to_deprecated_string();
event.data = Event::ProcessExecData {
.executable = executable,
};
@ -374,7 +374,7 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
current_processes.remove(event.pid);
continue;
} else if (type_string == "thread_create"sv) {
auto parent_tid = perf_event.get("parent_tid"sv).to_number<pid_t>();
auto parent_tid = perf_event.get_deprecated("parent_tid"sv).to_number<pid_t>();
event.data = Event::ThreadCreateData {
.parent_tid = parent_tid,
};
@ -388,13 +388,13 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
it->value->handle_thread_exit(event.tid, event.serial);
continue;
} else if (type_string == "read"sv) {
auto const string_index = perf_event.get("filename_index"sv).to_number<FlatPtr>();
auto const string_index = perf_event.get_deprecated("filename_index"sv).to_number<FlatPtr>();
event.data = Event::ReadData {
.fd = perf_event.get("fd"sv).to_number<int>(),
.size = perf_event.get("size"sv).to_number<size_t>(),
.fd = perf_event.get_deprecated("fd"sv).to_number<int>(),
.size = perf_event.get_deprecated("size"sv).to_number<size_t>(),
.path = profile_strings.get(string_index).value(),
.start_timestamp = perf_event.get("start_timestamp"sv).to_number<size_t>(),
.success = perf_event.get("success"sv).to_bool()
.start_timestamp = perf_event.get_deprecated("start_timestamp"sv).to_number<size_t>(),
.success = perf_event.get_deprecated("success"sv).to_bool()
};
} else {
dbgln("Unknown event type '{}'", type_string);