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

LibGUI: Move GUI::Model::Role to GUI::ModelRole

Browse source 
This is preparation for using ModelRole in the ModelIndex API.
This commit is contained in:
Andreas Kling 2020-08-16 16:00:07 +02:00
parent f6d7204689
commit a1e381a0f8
66 changed files with 201 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

4
DevTools/HackStudio/Debugger/BacktraceModel.cpp
View file

@ -32,9 +32,9 @@ NonnullRefPtr<BacktraceModel> BacktraceModel::create(const DebugSession& debug_s
return adopt(*new BacktraceModel(create_backtrace(debug_session, regs)));
}
GUI::Variant BacktraceModel::data(const GUI::ModelIndex& index, Role role) const
GUI::Variant BacktraceModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
{
if (role == Role::Display) {
if (role == GUI::ModelRole::Display) {
auto& frame = m_frames.at(index.row());
return frame.function_name;
}

2
DevTools/HackStudio/Debugger/BacktraceModel.h
View file

@ -45,7 +45,7 @@ public:
return "";
}
virtual GUI::Variant data(const GUI::ModelIndex& index, Role role = Role::Display) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override {}
virtual GUI::ModelIndex index(int row, int column, const GUI::ModelIndex&) const override;

6
DevTools/HackStudio/Debugger/VariablesModel.cpp
View file

@ -159,15 +159,15 @@ void VariablesModel::set_variable_value(const GUI::ModelIndex& index, const Stri
GUI::MessageBox::Type::Error);
}
GUI::Variant VariablesModel::data(const GUI::ModelIndex& index, Role role) const
GUI::Variant VariablesModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
{
auto* variable = static_cast<const DebugInfo::VariableInfo*>(index.internal_data());
switch (role) {
case Role::Display: {
case GUI::ModelRole::Display: {
auto value_as_string = variable_value_as_string(*variable);
return String::format("%s: %s", variable->name.characters(), value_as_string.characters());
}
case Role::Icon:
case GUI::ModelRole::Icon:
return m_variable_icon;
default:
return {};

2
DevTools/HackStudio/Debugger/VariablesModel.h
View file

@ -40,7 +40,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 1; }
virtual GUI::Variant data(const GUI::ModelIndex& index, Role role = Role::Display) const override;
virtual GUI::Variant data(const GUI::ModelIndex& index, GUI::ModelRole role) const override;
virtual void update() override;
virtual GUI::ModelIndex parent_index(const GUI::ModelIndex&) const override;
virtual GUI::ModelIndex index(int row, int column = 0, const GUI::ModelIndex& = GUI::ModelIndex()) const override;