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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Demos/ModelGallery/BasicModel.h
View file

@ -20,7 +20,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return m_items.size(); }
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return 1; }
virtual String column_name(int) const override { return "Item"_short_string; }
virtual ErrorOr<String> column_name(int) const override { return "Item"_short_string; }
virtual GUI::Variant data(GUI::ModelIndex const&, GUI::ModelRole = GUI::ModelRole::Display) const override;
virtual GUI::Model::MatchResult data_matches(GUI::ModelIndex const&, GUI::Variant const&) const override;

10
Userland/Demos/WidgetGallery/GalleryModels.h
View file

@ -27,11 +27,11 @@ 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
{
switch (column_index) {
case Column::Bitmap:
return {};
return String {};
case Column::Name:
return "Name"_short_string;
}
@ -112,13 +112,13 @@ public:
virtual int row_count(const GUI::ModelIndex&) const override { return m_icon_sets.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
{
switch (column_index) {
case Column::BigIcon:
return {};
return String {};
case Column::LittleIcon:
return {};
return String {};
case Column::Name:
return "Name"_short_string;
}