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

5
Userland/DevTools/HackStudio/Debugger/BacktraceModel.h
View file

@ -27,10 +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 DeprecatedString column_name(int) const override
{
return "";
}
virtual String column_name(int) const override { return {}; }
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;

8
Userland/DevTools/HackStudio/Debugger/DisassemblyModel.cpp
View file

@ -73,15 +73,15 @@ int DisassemblyModel::row_count(const GUI::ModelIndex&) const
return m_instructions.size();
}
DeprecatedString DisassemblyModel::column_name(int column) const
String DisassemblyModel::column_name(int column) const
{
switch (column) {
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();
default:
VERIFY_NOT_REACHED();
return {};

2
Userland/DevTools/HackStudio/Debugger/DisassemblyModel.h
View file

@ -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 DeprecatedString column_name(int) const override;
virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
private:

6
Userland/DevTools/HackStudio/Debugger/RegistersModel.cpp
View file

@ -86,13 +86,13 @@ int RegistersModel::row_count(const GUI::ModelIndex&) const
return m_registers.size();
}
DeprecatedString RegistersModel::column_name(int column) const
String RegistersModel::column_name(int column) const
{
switch (column) {
case Column::Register:
return "Register";
return "Register"_string.release_value_but_fixme_should_propagate_errors();
case Column::Value:
return "Value";
return "Value"_short_string;
default:
VERIFY_NOT_REACHED();
return {};

2
Userland/DevTools/HackStudio/Debugger/RegistersModel.h
View file

@ -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 DeprecatedString column_name(int) const override;
virtual 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; }

8
Userland/DevTools/HackStudio/Dialogs/ProjectTemplatesModel.cpp
View file

@ -53,15 +53,15 @@ int ProjectTemplatesModel::column_count(const GUI::ModelIndex&) const
return Column::__Count;
}
DeprecatedString ProjectTemplatesModel::column_name(int column) const
String ProjectTemplatesModel::column_name(int column) const
{
switch (column) {
case Column::Icon:
return "Icon";
return "Icon"_short_string;
case Column::Id:
return "ID";
return "ID"_short_string;
case Column::Name:
return "Name";
return "Name"_short_string;
}
VERIFY_NOT_REACHED();
}

2
Userland/DevTools/HackStudio/Dialogs/ProjectTemplatesModel.h
View file

@ -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 DeprecatedString column_name(int) const override;
virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
void update();

8
Userland/DevTools/HackStudio/FindInFilesWidget.cpp
View file

@ -39,15 +39,15 @@ 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 DeprecatedString column_name(int column) const override
virtual String column_name(int column) const override
{
switch (column) {
case Column::Filename:
return "Filename";
return "Filename"_string.release_value_but_fixme_should_propagate_errors();
case Column::Location:
return "#";
return "#"_short_string;
case Column::MatchedText:
return "Text";
return "Text"_short_string;
default:
VERIFY_NOT_REACHED();
}

5
Userland/DevTools/HackStudio/Git/GitFilesModel.h
View file

@ -19,10 +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 DeprecatedString column_name(int) const override
{
return "";
}
virtual String column_name(int) const override { return {}; }
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;

10
Userland/DevTools/HackStudio/ToDoEntriesWidget.cpp
View file

@ -30,17 +30,17 @@ 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 DeprecatedString column_name(int column) const override
virtual String column_name(int column) const override
{
switch (column) {
case Column::Filename:
return "Filename";
return "Filename"_string.release_value_but_fixme_should_propagate_errors();
case Column::Text:
return "Text";
return "Text"_short_string;
case Column::Line:
return "Line";
return "Line"_short_string;
case Column::Column:
return "Col";
return "Col"_short_string;
default:
VERIFY_NOT_REACHED();
}