mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 15:57:35 +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
|
@ -27,7 +27,7 @@ public:
|
|||
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return m_frames.size(); }
|
||||
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return 1; }
|
||||
|
||||
virtual String column_name(int) const override { return {}; }
|
||||
virtual ErrorOr<String> column_name(int) const override { return String {}; }
|
||||
|
||||
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
|
||||
|
||||
|
|
|
@ -73,18 +73,17 @@ int DisassemblyModel::row_count(const GUI::ModelIndex&) const
|
|||
return m_instructions.size();
|
||||
}
|
||||
|
||||
String DisassemblyModel::column_name(int column) const
|
||||
ErrorOr<String> DisassemblyModel::column_name(int column) const
|
||||
{
|
||||
switch (column) {
|
||||
case Column::Address:
|
||||
return "Address"_short_string;
|
||||
case Column::InstructionBytes:
|
||||
return "Insn Bytes"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("Insn Bytes"_string);
|
||||
case Column::Disassembly:
|
||||
return "Disassembly"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("Disassembly"_string);
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -45,7 +45,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:
|
||||
|
|
|
@ -86,16 +86,15 @@ int RegistersModel::row_count(const GUI::ModelIndex&) const
|
|||
return m_registers.size();
|
||||
}
|
||||
|
||||
String RegistersModel::column_name(int column) const
|
||||
ErrorOr<String> RegistersModel::column_name(int column) const
|
||||
{
|
||||
switch (column) {
|
||||
case Column::Register:
|
||||
return "Register"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("Register"_string);
|
||||
case Column::Value:
|
||||
return "Value"_short_string;
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,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;
|
||||
|
||||
PtraceRegisters const& raw_registers() const { return m_raw_registers; }
|
||||
|
|
|
@ -53,7 +53,7 @@ int ProjectTemplatesModel::column_count(const GUI::ModelIndex&) const
|
|||
return Column::__Count;
|
||||
}
|
||||
|
||||
String ProjectTemplatesModel::column_name(int column) const
|
||||
ErrorOr<String> ProjectTemplatesModel::column_name(int column) const
|
||||
{
|
||||
switch (column) {
|
||||
case Column::Icon:
|
||||
|
|
|
@ -35,7 +35,7 @@ public:
|
|||
|
||||
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
|
||||
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
|
||||
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;
|
||||
|
||||
void update();
|
||||
|
|
|
@ -39,11 +39,11 @@ public:
|
|||
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return m_matches.size(); }
|
||||
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; }
|
||||
|
||||
virtual String column_name(int column) const override
|
||||
virtual ErrorOr<String> column_name(int column) const override
|
||||
{
|
||||
switch (column) {
|
||||
case Column::Filename:
|
||||
return "Filename"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("Filename"_string);
|
||||
case Column::Location:
|
||||
return "#"_short_string;
|
||||
case Column::MatchedText:
|
||||
|
|
|
@ -19,7 +19,7 @@ public:
|
|||
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return m_files.size(); }
|
||||
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return 1; }
|
||||
|
||||
virtual String column_name(int) const override { return {}; }
|
||||
virtual ErrorOr<String> column_name(int) const override { return String {}; }
|
||||
|
||||
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
|
||||
|
||||
|
|
|
@ -30,11 +30,11 @@ public:
|
|||
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return m_matches.size(); }
|
||||
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 column) const override
|
||||
{
|
||||
switch (column) {
|
||||
case Column::Filename:
|
||||
return "Filename"_string.release_value_but_fixme_should_propagate_errors();
|
||||
return TRY("Filename"_string);
|
||||
case Column::Text:
|
||||
return "Text"_short_string;
|
||||
case Column::Line:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue