1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 07:37:35 +00:00

LibGUI+Userland: Propagate errors in Model::column_name()

This commit is contained in:
Sam Atkins 2023-06-13 16:30:15 +01:00 committed by Andreas Kling
parent 94bcb5bea8
commit f33824d2e9
73 changed files with 140 additions and 146 deletions

View file

@ -34,7 +34,7 @@ int CookiesModel::row_count(GUI::ModelIndex const& index) const
return 0;
}
String CookiesModel::column_name(int column) const
ErrorOr<String> CookiesModel::column_name(int column) const
{
switch (column) {
case Column::Domain:
@ -46,14 +46,14 @@ String CookiesModel::column_name(int column) const
case Column::Value:
return "Value"_short_string;
case Column::ExpiryTime:
return "Expiry time"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Expiry time"_string);
case Column::SameSite:
return "SameSite"_string.release_value_but_fixme_should_propagate_errors();
return TRY("SameSite"_string);
case Column::__Count:
return {};
return String {};
}
return {};
return String {};
}
GUI::ModelIndex CookiesModel::index(int row, int column, GUI::ModelIndex const&) const

View file

@ -30,7 +30,7 @@ public:
void clear_items();
virtual int row_count(GUI::ModelIndex const&) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int column) const override;
virtual ErrorOr<String> column_name(int) const override;
virtual GUI::ModelIndex index(int row, int column = 0, GUI::ModelIndex const& = GUI::ModelIndex()) const override;
virtual GUI::Variant data(GUI::ModelIndex const& index, GUI::ModelRole role = GUI::ModelRole::Display) const override;
virtual GUI::Model::MatchResult data_matches(GUI::ModelIndex const& index, GUI::Variant const& term) const override;

View file

@ -34,7 +34,7 @@ int HistoryModel::row_count(GUI::ModelIndex const& index) const
return 0;
}
String HistoryModel::column_name(int column) const
ErrorOr<String> HistoryModel::column_name(int column) const
{
switch (column) {
case Column::Title:
@ -45,7 +45,7 @@ String HistoryModel::column_name(int column) const
VERIFY_NOT_REACHED();
}
return {};
return String {};
}
GUI::ModelIndex HistoryModel::index(int row, int column, GUI::ModelIndex const&) const

View file

@ -25,7 +25,7 @@ public:
void clear_items();
virtual int row_count(GUI::ModelIndex const&) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int column) const override;
virtual ErrorOr<String> column_name(int) const override;
virtual GUI::ModelIndex index(int row, int column = 0, GUI::ModelIndex const& = GUI::ModelIndex()) const override;
virtual GUI::Variant data(GUI::ModelIndex const& index, GUI::ModelRole role = GUI::ModelRole::Display) const override;
virtual GUI::Model::MatchResult data_matches(GUI::ModelIndex const& index, GUI::Variant const& term) const override;

View file

@ -35,7 +35,7 @@ int StorageModel::row_count(GUI::ModelIndex const& index) const
return 0;
}
String StorageModel::column_name(int column) const
ErrorOr<String> StorageModel::column_name(int column) const
{
switch (column) {
case Column::Key:
@ -43,10 +43,10 @@ String StorageModel::column_name(int column) const
case Column::Value:
return "Value"_short_string;
case Column::__Count:
return {};
return String {};
}
return {};
return String {};
}
GUI::ModelIndex StorageModel::index(int row, int column, GUI::ModelIndex const&) const

View file

@ -22,7 +22,7 @@ public:
void clear_items();
virtual int row_count(GUI::ModelIndex const&) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int column) const override;
virtual ErrorOr<String> column_name(int) const override;
virtual GUI::ModelIndex index(int row, int column = 0, GUI::ModelIndex const& = GUI::ModelIndex()) const override;
virtual GUI::Variant data(GUI::ModelIndex const& index, GUI::ModelRole role = GUI::ModelRole::Display) const override;
virtual GUI::Model::MatchResult data_matches(GUI::ModelIndex const& index, GUI::Variant const& term) const override;

View file

@ -120,7 +120,7 @@ int AddEventDialog::MeridiemListModel::row_count(const GUI::ModelIndex&) const
return 2;
}
String AddEventDialog::MonthListModel::column_name(int column) const
ErrorOr<String> AddEventDialog::MonthListModel::column_name(int column) const
{
switch (column) {
case Column::Month:
@ -130,11 +130,11 @@ String AddEventDialog::MonthListModel::column_name(int column) const
}
}
String AddEventDialog::MeridiemListModel::column_name(int column) const
ErrorOr<String> AddEventDialog::MeridiemListModel::column_name(int column) const
{
switch (column) {
case Column::Meridiem:
return "Meridiem"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Meridiem"_string);
default:
VERIFY_NOT_REACHED();
}

View file

@ -38,7 +38,7 @@ private:
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual ErrorOr<String> column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
private:
@ -57,7 +57,7 @@ private:
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual ErrorOr<String> column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
private:

View file

@ -34,15 +34,15 @@ ErrorOr<void> CertificateStoreModel::load()
return {};
}
String CertificateStoreModel::column_name(int column) const
ErrorOr<String> CertificateStoreModel::column_name(int column) const
{
switch (column) {
case Column::IssuedTo:
return "Issued To"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Issued To"_string);
case Column::IssuedBy:
return "Issued By"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Issued By"_string);
case Column::Expire:
return "Expiration Date"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Expiration Date"_string);
default:
VERIFY_NOT_REACHED();
}

View file

@ -44,7 +44,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return m_certificates.size(); }
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual ErrorOr<String> column_name(int) const override;
virtual GUI::Variant data(GUI::ModelIndex const&, GUI::ModelRole) const override;
virtual ErrorOr<void> load();
virtual ErrorOr<size_t> add(Vector<Certificate> const&);

View file

@ -40,7 +40,7 @@ public:
return 2;
}
String column_name(int column) const override
ErrorOr<String> column_name(int column) const override
{
switch (column) {
case Column::Offset:

View file

@ -63,13 +63,13 @@ public:
return 2;
}
String column_name(int column) const override
ErrorOr<String> column_name(int column) const override
{
switch (column) {
case Column::Type:
return "Type"_short_string;
case Column::Value:
return m_is_little_endian ? "Value (Little Endian)"_string.release_value_but_fixme_should_propagate_errors() : "Value (Big Endian)"_string.release_value_but_fixme_should_propagate_errors();
return m_is_little_endian ? TRY("Value (Little Endian)"_string) : TRY("Value (Big Endian)"_string);
}
VERIFY_NOT_REACHED();
}

View file

@ -17,7 +17,7 @@ int InboxModel::row_count(GUI::ModelIndex const&) const
return m_entries.size();
}
String InboxModel::column_name(int column_index) const
ErrorOr<String> InboxModel::column_name(int column_index) const
{
switch (column_index) {
case Column::From:

View file

@ -32,7 +32,7 @@ public:
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual ErrorOr<String> column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
private:

View file

@ -15,11 +15,11 @@
#include <LibGUI/SortingProxyModel.h>
#include <LibGUI/TableView.h>
String MouseCursorModel::column_name(int column_index) const
ErrorOr<String> MouseCursorModel::column_name(int column_index) const
{
switch (column_index) {
case Column::Bitmap:
return {};
return String {};
case Column::Name:
return "Name"_short_string;
}

View file

@ -25,7 +25,7 @@ public:
virtual int row_count(const GUI::ModelIndex&) const override { return m_cursors.size(); }
virtual int column_count(const GUI::ModelIndex&) const override { return Column::__Count; }
virtual String column_name(int column_index) const override;
virtual ErrorOr<String> column_name(int column_index) const override;
virtual GUI::Variant data(const GUI::ModelIndex& index, GUI::ModelRole role) const override;
virtual void invalidate() override;

View file

@ -64,7 +64,7 @@ public:
return Columns::Page;
}
String column_name(int index) const override
ErrorOr<String> column_name(int index) const override
{
switch (index) {
case 0:

View file

@ -17,17 +17,17 @@ NonnullRefPtr<PartitionModel> PartitionModel::create()
return adopt_ref(*new PartitionModel);
}
String PartitionModel::column_name(int column) const
ErrorOr<String> PartitionModel::column_name(int column) const
{
switch (column) {
case Column::Partition:
return "Partition"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Partition"_string);
case Column::StartBlock:
return "Start Block"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Start Block"_string);
case Column::EndBlock:
return "End Block"_string.release_value_but_fixme_should_propagate_errors();
return TRY("End Block"_string);
case Column::TotalBlocks:
return "Total Blocks"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Total Blocks"_string);
case Column::Size:
return "Size"_short_string;
default:

View file

@ -28,7 +28,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return m_partition_table->partitions_count(); }
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual ErrorOr<String> column_name(int) const override;
virtual GUI::Variant data(GUI::ModelIndex const&, GUI::ModelRole) const override;
ErrorOr<void> set_device_path(DeprecatedString const&);

View file

@ -73,13 +73,13 @@ DeprecatedString PlaylistModel::format_duration(u32 duration_in_seconds)
return DeprecatedString::formatted("{:02}:{:02}:{:02}", duration_in_seconds / 3600, duration_in_seconds / 60, duration_in_seconds % 60);
}
String PlaylistModel::column_name(int column) const
ErrorOr<String> PlaylistModel::column_name(int column) const
{
switch (column) {
case 0:
return "Title"_short_string;
case 1:
return "Duration"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Duration"_string);
case 2:
return "Group"_short_string;
case 3:
@ -87,7 +87,7 @@ String PlaylistModel::column_name(int column) const
case 4:
return "Artist"_short_string;
case 5:
return "Filesize"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Filesize"_string);
}
VERIFY_NOT_REACHED();
}

View file

@ -24,7 +24,7 @@ public:
int row_count(const GUI::ModelIndex&) const override { return m_playlist_items.size(); }
int column_count(const GUI::ModelIndex&) const override { return 6; }
GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
String column_name(int column) const override;
ErrorOr<String> column_name(int column) const override;
Vector<M3UEntry>& items() { return m_playlist_items; }
private:

View file

@ -162,12 +162,12 @@ RefPtr<Core::MimeData> SheetModel::mime_data(const GUI::ModelSelection& selectio
return mime_data;
}
String SheetModel::column_name(int index) const
ErrorOr<String> SheetModel::column_name(int index) const
{
if (index < 0)
return {};
return String {};
return String::from_deprecated_string(m_sheet->column(index)).release_value_but_fixme_should_propagate_errors();
return TRY(String::from_deprecated_string(m_sheet->column(index)));
}
bool SheetModel::is_editable(const GUI::ModelIndex& index) const

View file

@ -23,7 +23,7 @@ public:
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return m_sheet->row_count(); }
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return m_sheet->column_count(); }
virtual String column_name(int) const override;
virtual ErrorOr<String> column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual RefPtr<Core::MimeData> mime_data(const GUI::ModelSelection&) const override;
virtual bool is_editable(const GUI::ModelIndex&) const override;

View file

@ -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:

View file

@ -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;

View file

@ -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();
}

View file

@ -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:

View file

@ -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;
}