mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 11:37:34 +00:00
Userland: Prefer _string over _short_string
As `_string` can't fail anymore (since 3434412), there are no real
benefits to use the short variant in most cases.
This commit is contained in:
Lucas CHOLLET
Andreas Kling
parent
a5edc9cdfc
commit
3f35ffb648
198 changed files with 684 additions and 684 deletions
|
|
@ -50,9 +50,9 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
|
|||
else
|
||||
return object.get_deprecated_string("ipv4_address"sv).value_or("").is_empty() ? *m_network_disconnected_bitmap : *m_network_connected_bitmap;
|
||||
});
|
||||
net_adapters_fields.empend("name", "Name"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_adapters_fields.empend("class_name", "Class"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_adapters_fields.empend("mac_address", "MAC"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_adapters_fields.empend("name", "Name"_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_adapters_fields.empend("class_name", "Class"_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_adapters_fields.empend("mac_address", "MAC"_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_adapters_fields.empend("Link status"_string, Gfx::TextAlignment::CenterLeft,
|
||||
[](JsonObject const& object) -> DeprecatedString {
|
||||
if (!object.get_bool("link_up"sv).value_or(false))
|
||||
|
|
@ -61,12 +61,12 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
|
|||
return DeprecatedString::formatted("{} Mb/s {}-duplex", object.get_i32("link_speed"sv).value_or(0),
|
||||
object.get_bool("link_full_duplex"sv).value_or(false) ? "full"sv : "half"sv);
|
||||
});
|
||||
net_adapters_fields.empend("IPv4"_short_string, Gfx::TextAlignment::CenterLeft,
|
||||
net_adapters_fields.empend("IPv4"_string, Gfx::TextAlignment::CenterLeft,
|
||||
[](JsonObject const& object) -> DeprecatedString {
|
||||
return object.get_deprecated_string("ipv4_address"sv).value_or(""sv);
|
||||
});
|
||||
net_adapters_fields.empend("packets_in", "Pkt In"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_adapters_fields.empend("packets_out", "Pkt Out"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_adapters_fields.empend("packets_in", "Pkt In"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_adapters_fields.empend("packets_out", "Pkt Out"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_adapters_fields.empend("bytes_in", "Bytes In"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_adapters_fields.empend("bytes_out", "Bytes Out"_string, Gfx::TextAlignment::CenterRight);
|
||||
m_adapter_model = GUI::JsonArrayModel::create("/sys/kernel/net/adapters", move(net_adapters_fields));
|
||||
|
|
@ -97,15 +97,15 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
|
|||
m_tcp_socket_table_view = tcp_sockets_group_box.add<GUI::TableView>();
|
||||
|
||||
Vector<GUI::JsonArrayModel::FieldSpec> net_tcp_fields;
|
||||
net_tcp_fields.empend("peer_address", "Peer"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_tcp_fields.empend("peer_port", "Port"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("local_address", "Local"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_tcp_fields.empend("local_port", "Port"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("state", "State"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_tcp_fields.empend("ack_number", "Ack#"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("sequence_number", "Seq#"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("packets_in", "Pkt In"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("packets_out", "Pkt Out"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("peer_address", "Peer"_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_tcp_fields.empend("peer_port", "Port"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("local_address", "Local"_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_tcp_fields.empend("local_port", "Port"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("state", "State"_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_tcp_fields.empend("ack_number", "Ack#"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("sequence_number", "Seq#"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("packets_in", "Pkt In"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("packets_out", "Pkt Out"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("bytes_in", "Bytes In"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_tcp_fields.empend("bytes_out", "Bytes Out"_string, Gfx::TextAlignment::CenterRight);
|
||||
m_tcp_socket_model = GUI::JsonArrayModel::create("/sys/kernel/net/tcp", move(net_tcp_fields));
|
||||
|
|
@ -117,10 +117,10 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
|
|||
m_udp_socket_table_view = udp_sockets_group_box.add<GUI::TableView>();
|
||||
|
||||
Vector<GUI::JsonArrayModel::FieldSpec> net_udp_fields;
|
||||
net_udp_fields.empend("peer_address", "Peer"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_udp_fields.empend("peer_port", "Port"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_udp_fields.empend("local_address", "Local"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_udp_fields.empend("local_port", "Port"_short_string, Gfx::TextAlignment::CenterRight);
|
||||
net_udp_fields.empend("peer_address", "Peer"_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_udp_fields.empend("peer_port", "Port"_string, Gfx::TextAlignment::CenterRight);
|
||||
net_udp_fields.empend("local_address", "Local"_string, Gfx::TextAlignment::CenterLeft);
|
||||
net_udp_fields.empend("local_port", "Port"_string, Gfx::TextAlignment::CenterRight);
|
||||
m_udp_socket_model = GUI::JsonArrayModel::create("/sys/kernel/net/udp", move(net_udp_fields));
|
||||
m_udp_socket_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_udp_socket_model)));
|
||||
|
||||
|
|
|
|||
|
|
@ -22,17 +22,17 @@ ErrorOr<NonnullRefPtr<ProcessFileDescriptorMapWidget>> ProcessFileDescriptorMapW
|
|||
widget->m_table_view = TRY(widget->try_add<GUI::TableView>());
|
||||
|
||||
Vector<GUI::JsonArrayModel::FieldSpec> pid_fds_fields;
|
||||
TRY(pid_fds_fields.try_empend("fd", "FD"_short_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_fds_fields.try_empend("class", "Class"_short_string, Gfx::TextAlignment::CenterLeft));
|
||||
TRY(pid_fds_fields.try_empend("offset", "Offset"_short_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_fds_fields.try_empend("absolute_path", "Path"_short_string, Gfx::TextAlignment::CenterLeft));
|
||||
TRY(pid_fds_fields.try_empend("Access"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
|
||||
TRY(pid_fds_fields.try_empend("fd", "FD"_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_fds_fields.try_empend("class", "Class"_string, Gfx::TextAlignment::CenterLeft));
|
||||
TRY(pid_fds_fields.try_empend("offset", "Offset"_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_fds_fields.try_empend("absolute_path", "Path"_string, Gfx::TextAlignment::CenterLeft));
|
||||
TRY(pid_fds_fields.try_empend("Access"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
|
||||
return object.get_bool("seekable"sv).value_or(false) ? "Seekable" : "Sequential";
|
||||
}));
|
||||
TRY(pid_fds_fields.try_empend("Blocking"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
|
||||
return object.get_bool("blocking"sv).value_or(false) ? "Blocking" : "Nonblocking";
|
||||
}));
|
||||
TRY(pid_fds_fields.try_empend("On exec"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
|
||||
TRY(pid_fds_fields.try_empend("On exec"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
|
||||
return object.get_bool("cloexec"sv).value_or(false) ? "Close" : "Keep";
|
||||
}));
|
||||
TRY(pid_fds_fields.try_empend("Can read"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
|
||||
|
|
|
|||
|
|
@ -57,13 +57,13 @@ ErrorOr<NonnullRefPtr<ProcessMemoryMapWidget>> ProcessMemoryMapWidget::try_creat
|
|||
|
||||
Vector<GUI::JsonArrayModel::FieldSpec> pid_vm_fields;
|
||||
TRY(pid_vm_fields.try_empend(
|
||||
"Address"_short_string, Gfx::TextAlignment::CenterLeft,
|
||||
"Address"_string, Gfx::TextAlignment::CenterLeft,
|
||||
[](auto& object) { return DeprecatedString::formatted("{:p}", object.get_u64("address"sv).value_or(0)); },
|
||||
[](auto& object) { return object.get_u64("address"sv).value_or(0); }));
|
||||
TRY(pid_vm_fields.try_empend("size", "Size"_short_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_vm_fields.try_empend("size", "Size"_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_vm_fields.try_empend("amount_resident", "Resident"_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_vm_fields.try_empend("amount_dirty", "Dirty"_short_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_vm_fields.try_empend("Access"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
|
||||
TRY(pid_vm_fields.try_empend("amount_dirty", "Dirty"_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_vm_fields.try_empend("Access"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
|
||||
StringBuilder builder;
|
||||
if (object.get_bool("readable"sv).value_or(false))
|
||||
builder.append('R');
|
||||
|
|
@ -102,8 +102,8 @@ ErrorOr<NonnullRefPtr<ProcessMemoryMapWidget>> ProcessMemoryMapWidget::try_creat
|
|||
auto pagemap = object.get_deprecated_string("pagemap"sv).value_or({});
|
||||
return pagemap;
|
||||
}));
|
||||
TRY(pid_vm_fields.try_empend("cow_pages", "# CoW"_short_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_vm_fields.try_empend("name", "Name"_short_string, Gfx::TextAlignment::CenterLeft));
|
||||
TRY(pid_vm_fields.try_empend("cow_pages", "# CoW"_string, Gfx::TextAlignment::CenterRight));
|
||||
TRY(pid_vm_fields.try_empend("name", "Name"_string, Gfx::TextAlignment::CenterLeft));
|
||||
widget->m_json_model = GUI::JsonArrayModel::create({}, move(pid_vm_fields));
|
||||
widget->m_table_view->set_model(TRY(GUI::SortingProxyModel::create(*widget->m_json_model)));
|
||||
|
||||
|
|
|
|||
|
|
@ -77,65 +77,65 @@ ErrorOr<String> ProcessModel::column_name(int column) const
|
|||
case Column::Icon:
|
||||
return String {};
|
||||
case Column::PID:
|
||||
return "PID"_short_string;
|
||||
return "PID"_string;
|
||||
case Column::TID:
|
||||
return "TID"_short_string;
|
||||
return "TID"_string;
|
||||
case Column::PPID:
|
||||
return "PPID"_short_string;
|
||||
return "PPID"_string;
|
||||
case Column::PGID:
|
||||
return "PGID"_short_string;
|
||||
return "PGID"_string;
|
||||
case Column::SID:
|
||||
return "SID"_short_string;
|
||||
return "SID"_string;
|
||||
case Column::State:
|
||||
return "State"_short_string;
|
||||
return "State"_string;
|
||||
case Column::User:
|
||||
return "User"_short_string;
|
||||
return "User"_string;
|
||||
case Column::Priority:
|
||||
return "Pr"_short_string;
|
||||
return "Pr"_string;
|
||||
case Column::Virtual:
|
||||
return "Virtual"_short_string;
|
||||
return "Virtual"_string;
|
||||
case Column::Physical:
|
||||
return "Physical"_string;
|
||||
case Column::DirtyPrivate:
|
||||
return "Private"_short_string;
|
||||
return "Private"_string;
|
||||
case Column::CleanInode:
|
||||
return "CleanI"_short_string;
|
||||
return "CleanI"_string;
|
||||
case Column::PurgeableVolatile:
|
||||
return "Purg:V"_short_string;
|
||||
return "Purg:V"_string;
|
||||
case Column::PurgeableNonvolatile:
|
||||
return "Purg:N"_short_string;
|
||||
return "Purg:N"_string;
|
||||
case Column::CPU:
|
||||
return "CPU"_short_string;
|
||||
return "CPU"_string;
|
||||
case Column::Processor:
|
||||
return "Processor"_string;
|
||||
case Column::Name:
|
||||
return "Name"_short_string;
|
||||
return "Name"_string;
|
||||
case Column::Syscalls:
|
||||
return "Syscalls"_string;
|
||||
case Column::InodeFaults:
|
||||
return "F:Inode"_short_string;
|
||||
return "F:Inode"_string;
|
||||
case Column::ZeroFaults:
|
||||
return "F:Zero"_short_string;
|
||||
return "F:Zero"_string;
|
||||
case Column::CowFaults:
|
||||
return "F:CoW"_short_string;
|
||||
return "F:CoW"_string;
|
||||
case Column::IPv4SocketReadBytes:
|
||||
return "IPv4 In"_short_string;
|
||||
return "IPv4 In"_string;
|
||||
case Column::IPv4SocketWriteBytes:
|
||||
return "IPv4 Out"_string;
|
||||
case Column::UnixSocketReadBytes:
|
||||
return "Unix In"_short_string;
|
||||
return "Unix In"_string;
|
||||
case Column::UnixSocketWriteBytes:
|
||||
return "Unix Out"_string;
|
||||
case Column::FileReadBytes:
|
||||
return "File In"_short_string;
|
||||
return "File In"_string;
|
||||
case Column::FileWriteBytes:
|
||||
return "File Out"_string;
|
||||
case Column::Pledge:
|
||||
return "Pledge"_short_string;
|
||||
return "Pledge"_string;
|
||||
case Column::Veil:
|
||||
return "Veil"_short_string;
|
||||
return "Veil"_string;
|
||||
case Column::Command:
|
||||
return "Command"_short_string;
|
||||
return "Command"_string;
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
|
@ -226,7 +226,7 @@ GUI::Variant ProcessModel::data(GUI::ModelIndex const& index, GUI::ModelRole rol
|
|||
case Column::Name:
|
||||
return thread.current_state.name;
|
||||
case Column::Command:
|
||||
return thread.current_state.command.visit([](String const& cmdline) { return cmdline; }, [](auto const&) { return ""_short_string; });
|
||||
return thread.current_state.command.visit([](String const& cmdline) { return cmdline; }, [](auto const&) { return ""_string; });
|
||||
case Column::Syscalls:
|
||||
return thread.current_state.syscall_count;
|
||||
case Column::InodeFaults:
|
||||
|
|
@ -296,7 +296,7 @@ GUI::Variant ProcessModel::data(GUI::ModelIndex const& index, GUI::ModelRole rol
|
|||
return DeprecatedString::formatted("{} (*)", thread.current_state.name);
|
||||
return thread.current_state.name;
|
||||
case Column::Command:
|
||||
return thread.current_state.command.visit([](String const& cmdline) { return cmdline; }, [](auto const&) { return ""_short_string; });
|
||||
return thread.current_state.command.visit([](String const& cmdline) { return cmdline; }, [](auto const&) { return ""_string; });
|
||||
case Column::Syscalls:
|
||||
return thread.current_state.syscall_count;
|
||||
case Column::InodeFaults:
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ ErrorOr<NonnullRefPtr<ProcessUnveiledPathsWidget>> ProcessUnveiledPathsWidget::t
|
|||
widget->m_table_view = TRY(widget->try_add<GUI::TableView>());
|
||||
|
||||
Vector<GUI::JsonArrayModel::FieldSpec> pid_unveil_fields;
|
||||
TRY(pid_unveil_fields.try_empend("path", "Path"_short_string, Gfx::TextAlignment::CenterLeft));
|
||||
TRY(pid_unveil_fields.try_empend("path", "Path"_string, Gfx::TextAlignment::CenterLeft));
|
||||
TRY(pid_unveil_fields.try_empend("permissions", "Permissions"_string, Gfx::TextAlignment::CenterLeft));
|
||||
|
||||
widget->m_model = GUI::JsonArrayModel::create({}, move(pid_unveil_fields));
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@ public:
|
|||
{
|
||||
switch (column) {
|
||||
case Column::Address:
|
||||
return "Address"_short_string;
|
||||
return "Address"_string;
|
||||
case Column::Object:
|
||||
return "Object"_short_string;
|
||||
return "Object"_string;
|
||||
case Column::Symbol:
|
||||
return "Symbol"_short_string;
|
||||
return "Symbol"_string;
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -124,10 +124,10 @@ public:
|
|||
|
||||
Vector<GUI::JsonArrayModel::FieldSpec> df_fields;
|
||||
df_fields.empend("mount_point", "Mount point"_string, Gfx::TextAlignment::CenterLeft);
|
||||
df_fields.empend("class_name", "Class"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
df_fields.empend("source", "Source"_short_string, Gfx::TextAlignment::CenterLeft);
|
||||
df_fields.empend("class_name", "Class"_string, Gfx::TextAlignment::CenterLeft);
|
||||
df_fields.empend("source", "Source"_string, Gfx::TextAlignment::CenterLeft);
|
||||
df_fields.empend(
|
||||
"Size"_short_string, Gfx::TextAlignment::CenterRight,
|
||||
"Size"_string, Gfx::TextAlignment::CenterRight,
|
||||
[](JsonObject const& object) {
|
||||
StringBuilder size_builder;
|
||||
size_builder.append(' ');
|
||||
|
|
@ -148,7 +148,7 @@ public:
|
|||
return percentage;
|
||||
});
|
||||
df_fields.empend(
|
||||
"Used"_short_string, Gfx::TextAlignment::CenterRight,
|
||||
"Used"_string, Gfx::TextAlignment::CenterRight,
|
||||
[](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);
|
||||
|
|
@ -168,7 +168,7 @@ public:
|
|||
[](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"_short_string, Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) {
|
||||
df_fields.empend("Access"_string, 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";
|
||||
|
|
@ -427,7 +427,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
},
|
||||
&process_table_view);
|
||||
|
||||
auto file_menu = TRY(window->try_add_menu("&File"_short_string));
|
||||
auto file_menu = TRY(window->try_add_menu("&File"_string));
|
||||
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) {
|
||||
GUI::Application::the()->quit();
|
||||
})));
|
||||
|
|
@ -466,7 +466,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
TRY(make_frequency_action(3));
|
||||
TRY(make_frequency_action(5));
|
||||
|
||||
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
|
||||
auto help_menu = TRY(window->try_add_menu("&Help"_string));
|
||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
|
||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("System Monitor", app_icon, window)));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue