1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 23:07: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

@ -131,22 +131,21 @@ int DisassemblyModel::row_count(GUI::ModelIndex const&) const
return m_instructions.size();
}
String DisassemblyModel::column_name(int column) const
ErrorOr<String> DisassemblyModel::column_name(int column) const
{
switch (column) {
case Column::SampleCount:
return m_profile.show_percentages() ? "% Samples"_string.release_value_but_fixme_should_propagate_errors() : "# Samples"_string.release_value_but_fixme_should_propagate_errors();
return m_profile.show_percentages() ? TRY("% Samples"_string) : TRY("# Samples"_string);
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);
case Column::SourceLocation:
return "Source Location"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Source Location"_string);
default:
VERIFY_NOT_REACHED();
return {};
}
}

View file

@ -46,7 +46,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
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 bool is_column_sortable(int) const override { return false; }

View file

@ -142,18 +142,17 @@ int FileEventModel::column_count(GUI::ModelIndex const&) const
return Column::__Count;
}
String FileEventModel::column_name(int column) const
ErrorOr<String> FileEventModel::column_name(int column) const
{
switch (column) {
case Column::Path:
return "Path"_short_string;
case Column::Count:
return "Event Count"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Event Count"_string);
case Column::Duration:
return "Duration [ms]"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Duration [ms]"_string);
default:
VERIFY_NOT_REACHED();
return {};
}
}

View file

@ -74,7 +74,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
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 GUI::ModelIndex index(int row, int column, GUI::ModelIndex const& parent = GUI::ModelIndex()) const override;
virtual GUI::ModelIndex parent_index(GUI::ModelIndex const&) const override;

View file

@ -29,7 +29,7 @@ int IndividualSampleModel::column_count(GUI::ModelIndex const&) const
return Column::__Count;
}
String IndividualSampleModel::column_name(int column) const
ErrorOr<String> IndividualSampleModel::column_name(int column) const
{
switch (column) {
case Column::Address:

View file

@ -31,7 +31,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
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;
private:

View file

@ -74,22 +74,21 @@ int ProfileModel::column_count(GUI::ModelIndex const&) const
return Column::__Count;
}
String ProfileModel::column_name(int column) const
ErrorOr<String> ProfileModel::column_name(int column) const
{
switch (column) {
case Column::SampleCount:
return m_profile.show_percentages() ? "% Samples"_string.release_value_but_fixme_should_propagate_errors() : "# Samples"_string.release_value_but_fixme_should_propagate_errors();
return m_profile.show_percentages() ? TRY("% Samples"_string) : TRY("# Samples"_string);
case Column::SelfCount:
return m_profile.show_percentages() ? "% Self"_short_string : "# Self"_short_string;
case Column::ObjectName:
return "Object"_short_string;
case Column::StackFrame:
return "Stack Frame"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Stack Frame"_string);
case Column::SymbolAddress:
return "Symbol Address"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Symbol Address"_string);
default:
VERIFY_NOT_REACHED();
return {};
}
}

View file

@ -34,7 +34,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
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 GUI::ModelIndex index(int row, int column, GUI::ModelIndex const& parent = GUI::ModelIndex()) const override;
virtual GUI::ModelIndex parent_index(GUI::ModelIndex const&) const override;

View file

@ -28,23 +28,23 @@ int SamplesModel::column_count(GUI::ModelIndex const&) const
return Column::__Count;
}
String SamplesModel::column_name(int column) const
ErrorOr<String> SamplesModel::column_name(int column) const
{
switch (column) {
case Column::SampleIndex:
return "#"_short_string;
case Column::Timestamp:
return "Timestamp"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Timestamp"_string);
case Column::ProcessID:
return "PID"_short_string;
case Column::ThreadID:
return "TID"_short_string;
case Column::ExecutableName:
return "Executable"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Executable"_string);
case Column::LostSamples:
return "Lost Samples"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Lost Samples"_string);
case Column::InnermostStackFrame:
return "Innermost Frame"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Innermost Frame"_string);
case Column::Path:
return "Path"_short_string;
default:

View file

@ -36,7 +36,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
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 bool is_column_sortable(int) const override { return false; }

View file

@ -26,23 +26,23 @@ int SignpostsModel::column_count(GUI::ModelIndex const&) const
return Column::__Count;
}
String SignpostsModel::column_name(int column) const
ErrorOr<String> SignpostsModel::column_name(int column) const
{
switch (column) {
case Column::SignpostIndex:
return "#"_short_string;
case Column::Timestamp:
return "Timestamp"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Timestamp"_string);
case Column::ProcessID:
return "PID"_short_string;
case Column::ThreadID:
return "TID"_short_string;
case Column::ExecutableName:
return "Executable"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Executable"_string);
case Column::SignpostString:
return "String"_short_string;
case Column::SignpostArgument:
return "Argument"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Argument"_string);
default:
VERIFY_NOT_REACHED();
}

View file

@ -35,7 +35,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
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 bool is_column_sortable(int) const override { return false; }

View file

@ -122,20 +122,19 @@ int SourceModel::row_count(GUI::ModelIndex const&) const
return m_source_lines.size();
}
String SourceModel::column_name(int column) const
ErrorOr<String> SourceModel::column_name(int column) const
{
switch (column) {
case Column::SampleCount:
return m_profile.show_percentages() ? "% Samples"_string.release_value_but_fixme_should_propagate_errors() : "# Samples"_string.release_value_but_fixme_should_propagate_errors();
return m_profile.show_percentages() ? TRY("% Samples"_string) : TRY("# Samples"_string);
case Column::SourceCode:
return "Source Code"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Source Code"_string);
case Column::Location:
return "Location"_string.release_value_but_fixme_should_propagate_errors();
return TRY("Location"_string);
case Column::LineNumber:
return "Line"_short_string;
default:
VERIFY_NOT_REACHED();
return {};
}
}

View file

@ -38,7 +38,7 @@ public:
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
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 bool is_column_sortable(int) const override { return false; }