mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 18:17:45 +00:00
LibGUI+Userland: Propagate errors in Model::column_name()
This commit is contained in:
parent
94bcb5bea8
commit
f33824d2e9
73 changed files with 140 additions and 146 deletions
|
@ -71,11 +71,11 @@ int ProcessModel::column_count(GUI::ModelIndex const&) const
|
|||
return Column::__Count;
|
||||
}
|
||||
|
||||
String ProcessModel::column_name(int column) const
|
||||
ErrorOr<String> ProcessModel::column_name(int column) const
|
||||
{
|
||||
switch (column) {
|
||||
case Column::Icon:
|
||||
return {};
|
||||
return String {};
|
||||
case Column::PID:
|
||||
return "PID"_short_string;
|
||||
case Column::TID:
|
||||
|
@ -95,7 +95,7 @@ String ProcessModel::column_name(int column) const
|
|||
case Column::Virtual:
|
||||
return "Virtual"_short_string;
|
||||
case Column::Physical:
|
||||
return "Physical"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("Physical"_string);
|
||||
case Column::DirtyPrivate:
|
||||
return "Private"_short_string;
|
||||
case Column::CleanInode:
|
||||
|
@ -107,11 +107,11 @@ String ProcessModel::column_name(int column) const
|
|||
case Column::CPU:
|
||||
return "CPU"_short_string;
|
||||
case Column::Processor:
|
||||
return "Processor"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("Processor"_string);
|
||||
case Column::Name:
|
||||
return "Name"_short_string;
|
||||
case Column::Syscalls:
|
||||
return "Syscalls"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("Syscalls"_string);
|
||||
case Column::InodeFaults:
|
||||
return "F:Inode"_short_string;
|
||||
case Column::ZeroFaults:
|
||||
|
@ -121,15 +121,15 @@ String ProcessModel::column_name(int column) const
|
|||
case Column::IPv4SocketReadBytes:
|
||||
return "IPv4 In"_short_string;
|
||||
case Column::IPv4SocketWriteBytes:
|
||||
return "IPv4 Out"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("IPv4 Out"_string);
|
||||
case Column::UnixSocketReadBytes:
|
||||
return "Unix In"_short_string;
|
||||
case Column::UnixSocketWriteBytes:
|
||||
return "Unix Out"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("Unix Out"_string);
|
||||
case Column::FileReadBytes:
|
||||
return "File In"_short_string;
|
||||
case Column::FileWriteBytes:
|
||||
return "File Out"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("File Out"_string);
|
||||
case Column::Pledge:
|
||||
return "Pledge"_short_string;
|
||||
case Column::Veil:
|
||||
|
|
|
@ -63,7 +63,7 @@ public:
|
|||
virtual int tree_column() const override { return Column::Name; }
|
||||
virtual int row_count(GUI::ModelIndex const&) const override;
|
||||
virtual int column_count(GUI::ModelIndex const&) const override;
|
||||
virtual String column_name(int column) const override;
|
||||
virtual ErrorOr<String> column_name(int) const override;
|
||||
virtual GUI::Variant data(GUI::ModelIndex const&, GUI::ModelRole) const override;
|
||||
virtual GUI::ModelIndex index(int row, int column, GUI::ModelIndex const& parent = {}) const override;
|
||||
virtual GUI::ModelIndex parent_index(GUI::ModelIndex const&) const override;
|
||||
|
|
|
@ -48,7 +48,7 @@ public:
|
|||
// NOTE: The icon column is nameless in ProcessModel, but we want it to have a name here.
|
||||
return "Icon";
|
||||
}
|
||||
return m_target.column_name(index.row());
|
||||
return m_target.column_name(index.row()).release_value_but_fixme_should_propagate_errors();
|
||||
}
|
||||
return m_target_index.sibling_at_column(index.row()).data();
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ public:
|
|||
int row_count(GUI::ModelIndex const&) const override { return m_symbols.size(); };
|
||||
bool is_column_sortable(int) const override { return false; }
|
||||
|
||||
String column_name(int column) const override
|
||||
ErrorOr<String> column_name(int column) const override
|
||||
{
|
||||
switch (column) {
|
||||
case Column::Address:
|
||||
|
|
|
@ -303,7 +303,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
for (auto column = 0; column < ProcessModel::Column::__Count; ++column) {
|
||||
process_table_view.set_column_visible(column,
|
||||
Config::read_bool("SystemMonitor"sv, "ProcessTableColumns"sv, process_model->column_name(column),
|
||||
Config::read_bool("SystemMonitor"sv, "ProcessTableColumns"sv, TRY(process_model->column_name(column)),
|
||||
process_model->is_default_column(column)));
|
||||
}
|
||||
|
||||
|
@ -516,7 +516,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
// to be loaded the next time the application is opened.
|
||||
auto& process_table_header = process_table_view.column_header();
|
||||
for (auto column = 0; column < ProcessModel::Column::__Count; ++column)
|
||||
Config::write_bool("SystemMonitor"sv, "ProcessTableColumns"sv, process_model->column_name(column), process_table_header.is_section_visible(column));
|
||||
Config::write_bool("SystemMonitor"sv, "ProcessTableColumns"sv, TRY(process_model->column_name(column)), process_table_header.is_section_visible(column));
|
||||
|
||||
return exec;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue