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

Userland: Port Model::column_name() to String

Browse source
This commit is contained in:
Karol Kosek 2023-05-14 19:02:08 +02:00 • committed by Andreas Kling
parent 741f07dedf
commit 945f05ed76
70 changed files with 218 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/DevTools/Profiler/DisassemblyModel.cpp
View file

@ -131,19 +131,19 @@ int DisassemblyModel::row_count(GUI::ModelIndex const&) const
return m_instructions.size();
}
DeprecatedString DisassemblyModel::column_name(int column) const
String DisassemblyModel::column_name(int column) const
{
switch (column) {
case Column::SampleCount:
return m_profile.show_percentages() ? "% Samples" : "# Samples";
return m_profile.show_percentages() ? "% Samples"_string.release_value_but_fixme_should_propagate_errors() : "# Samples"_string.release_value_but_fixme_should_propagate_errors();
case Column::Address:
return "Address";
return "Address"_short_string;
case Column::InstructionBytes:
return "Insn Bytes";
return "Insn Bytes"_string.release_value_but_fixme_should_propagate_errors();
case Column::Disassembly:
return "Disassembly";
return "Disassembly"_string.release_value_but_fixme_should_propagate_errors();
case Column::SourceLocation:
return "Source Location";
return "Source Location"_string.release_value_but_fixme_should_propagate_errors();
default:
VERIFY_NOT_REACHED();
return {};

2
Userland/DevTools/Profiler/DisassemblyModel.h
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 DeprecatedString column_name(int) const override;
virtual 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; }

8
Userland/DevTools/Profiler/FilesystemEventModel.cpp
View file

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

2
Userland/DevTools/Profiler/FilesystemEventModel.h
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 DeprecatedString column_name(int) const override;
virtual 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;

8
Userland/DevTools/Profiler/IndividualSampleModel.cpp
View file

@ -29,15 +29,15 @@ int IndividualSampleModel::column_count(GUI::ModelIndex const&) const
return Column::__Count;
}
DeprecatedString IndividualSampleModel::column_name(int column) const
String IndividualSampleModel::column_name(int column) const
{
switch (column) {
case Column::Address:
return "Address";
return "Address"_short_string;
case Column::ObjectName:
return "Object";
return "Object"_short_string;
case Column::Symbol:
return "Symbol";
return "Symbol"_short_string;
default:
VERIFY_NOT_REACHED();
}

2
Userland/DevTools/Profiler/IndividualSampleModel.h
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 DeprecatedString column_name(int) const override;
virtual String column_name(int) const override;
virtual GUI::Variant data(GUI::ModelIndex const&, GUI::ModelRole) const override;
private:

12
Userland/DevTools/Profiler/ProfileModel.cpp
View file

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

2
Userland/DevTools/Profiler/ProfileModel.h
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 DeprecatedString column_name(int) const override;
virtual 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;

18
Userland/DevTools/Profiler/SamplesModel.cpp
View file

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

2
Userland/DevTools/Profiler/SamplesModel.h
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 DeprecatedString column_name(int) const override;
virtual 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; }

16
Userland/DevTools/Profiler/SignpostsModel.cpp
View file

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

2
Userland/DevTools/Profiler/SignpostsModel.h
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 DeprecatedString column_name(int) const override;
virtual 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; }

10
Userland/DevTools/Profiler/SourceModel.cpp
View file

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

2
Userland/DevTools/Profiler/SourceModel.h
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 DeprecatedString column_name(int) const override;
virtual 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; }