RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 16:17:45 +00:00
Code Issues Activity Actions

Everywhere: Replace Model::update() with Model::invalidate()

Browse source 
Most of the models were just calling did_update anyway, which is
pointless since it can be unified to the base Model class. Instead, code
calling update() will now call invalidate(), which functions identically
and is more obvious in what it does.

Additionally, a default implementation is provided, which removes the
need to add empty implementations of update() for each model subclass.

Co-Authored-By: Ali Mohammad Pur <ali.mpfard@gmail.com>
This commit is contained in:
sin-ack 2021-05-25 14:13:19 +00:00 • committed by Andreas Kling
parent 5cd2e0f3a2
commit ca2c81251a
100 changed files with 116 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/DevTools/HackStudio/ClassViewWidget.h
View file

@ -45,7 +45,6 @@ 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&, GUI::ModelRole role) const override;
virtual void update() override { did_update(); }
virtual GUI::ModelIndex parent_index(const GUI::ModelIndex&) const override;
virtual GUI::ModelIndex index(int row, int column = 0, const GUI::ModelIndex& parent_index = GUI::ModelIndex()) const override;

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

@ -33,7 +33,6 @@ public:
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;
struct FrameInfo {

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

@ -111,9 +111,4 @@ GUI::Variant DisassemblyModel::data(const GUI::ModelIndex& index, GUI::ModelRole
return {};
}
void DisassemblyModel::update()
{
did_update();
}
}

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

@ -46,7 +46,6 @@ public:
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override;
private:
DisassemblyModel(const Debug::DebugSession&, const PtraceRegisters&);

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

@ -136,9 +136,4 @@ GUI::Variant RegistersModel::data(const GUI::ModelIndex& index, GUI::ModelRole r
return {};
}
void RegistersModel::update()
{
did_update();
}
}

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

@ -42,7 +42,6 @@ public:
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override;
const PtraceRegisters& raw_registers() const { return m_raw_registers; }

5
Userland/DevTools/HackStudio/Debugger/VariablesModel.cpp
View file

@ -158,11 +158,6 @@ GUI::Variant VariablesModel::data(const GUI::ModelIndex& index, GUI::ModelRole r
}
}
void VariablesModel::update()
{
did_update();
}
RefPtr<VariablesModel> VariablesModel::create(const PtraceRegisters& regs)
{
auto lib = Debugger::the().session()->library_at(regs.ip());

1
Userland/DevTools/HackStudio/Debugger/VariablesModel.h
View file

@ -23,7 +23,6 @@ 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, 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;

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

@ -24,7 +24,7 @@ ProjectTemplatesModel::ProjectTemplatesModel()
if (!watcher_or_error.is_error()) {
m_file_watcher = watcher_or_error.release_value();
m_file_watcher->on_change = [&](auto) {
update();
invalidate();
};
auto watch_result = m_file_watcher->add_watch(

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

@ -37,8 +37,8 @@ public:
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override;
void update();
void rescan_templates();
private:

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

@ -76,7 +76,6 @@ public:
return {};
}
virtual void update() override { }
virtual GUI::ModelIndex index(int row, int column = 0, const GUI::ModelIndex& = GUI::ModelIndex()) const override
{
if (row < 0 || row >= (int)m_matches.size())

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

@ -27,7 +27,6 @@ public:
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;
private:

4
Userland/DevTools/HackStudio/HackStudioWidget.cpp
View file

@ -268,7 +268,7 @@ bool HackStudioWidget::open_file(const String& full_filename)
}
}
m_open_files_view->model()->update();
m_open_files_view->model()->invalidate();
}
current_editor().set_document(const_cast<GUI::TextDocument&>(new_project_file->document()));
@ -1115,7 +1115,7 @@ void HackStudioWidget::handle_external_file_deletion(const String& filepath)
}
}
m_open_files_view->model()->update();
m_open_files_view->model()->invalidate();
}
HackStudioWidget::~HackStudioWidget()

1
Userland/DevTools/HackStudio/Locator.cpp
View file

@ -74,7 +74,6 @@ public:
}
return {};
}
virtual void update() override {};
const Vector<Suggestion>& suggestions() const { return m_suggestions; }

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

@ -71,7 +71,6 @@ public:
return {};
}
virtual void update() override { }
virtual GUI::ModelIndex index(int row, int column = 0, const GUI::ModelIndex& = GUI::ModelIndex()) const override
{
if (row < 0 || row >= (int)m_matches.size())

2
Userland/DevTools/Inspector/RemoteObject.cpp
View file

@ -16,7 +16,7 @@ RemoteObject::RemoteObject()
RemoteObjectPropertyModel& RemoteObject::property_model()
{
m_property_model->update();
m_property_model->invalidate();
return *m_property_model;
}

5
Userland/DevTools/Inspector/RemoteObjectGraphModel.cpp
View file

@ -95,9 +95,4 @@ GUI::Variant RemoteObjectGraphModel::data(const GUI::ModelIndex& index, GUI::Mod
return {};
}
void RemoteObjectGraphModel::update()
{
did_update();
}
}

1
Userland/DevTools/Inspector/RemoteObjectGraphModel.h
View file

@ -30,7 +30,6 @@ public:
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual GUI::ModelIndex index(int row, int column, const GUI::ModelIndex& parent = GUI::ModelIndex()) const override;
virtual GUI::ModelIndex parent_index(const GUI::ModelIndex&) const override;
virtual void update() override;
private:
explicit RemoteObjectGraphModel(RemoteProcess&);

5
Userland/DevTools/Inspector/RemoteObjectPropertyModel.cpp
View file

@ -67,11 +67,6 @@ GUI::Variant RemoteObjectPropertyModel::data(const GUI::ModelIndex& index, GUI::
return {};
}
void RemoteObjectPropertyModel::update()
{
did_update();
}
void RemoteObjectPropertyModel::set_data(const GUI::ModelIndex& index, const GUI::Variant& new_value)
{
if (!index.is_valid())

1
Userland/DevTools/Inspector/RemoteObjectPropertyModel.h
View file

@ -34,7 +34,6 @@ public:
virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void set_data(const GUI::ModelIndex&, const GUI::Variant&) override;
virtual void update() override;
virtual bool is_editable(const GUI::ModelIndex& index) const override { return index.column() == Column::Value; }
virtual GUI::ModelIndex index(int row, int column, const GUI::ModelIndex& parent = GUI::ModelIndex()) const override;
virtual GUI::ModelIndex parent_index(const GUI::ModelIndex&) const override;

2
Userland/DevTools/Inspector/RemoteProcess.cpp
View file

@ -71,7 +71,7 @@ void RemoteProcess::handle_get_all_objects_response(const JsonObject& response)
}
}
m_object_graph_model->update();
m_object_graph_model->invalidate();
if (on_update)
on_update();

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

@ -207,9 +207,4 @@ GUI::Variant DisassemblyModel::data(const GUI::ModelIndex& index, GUI::ModelRole
return {};
}
void DisassemblyModel::update()
{
did_update();
}
}

1
Userland/DevTools/Profiler/DisassemblyModel.h
View file

@ -47,7 +47,6 @@ public:
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override;
virtual bool is_column_sortable(int) const override { return false; }
private:

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

@ -67,9 +67,4 @@ GUI::Variant IndividualSampleModel::data(const GUI::ModelIndex& index, GUI::Mode
return {};
}
void IndividualSampleModel::update()
{
did_update(Model::InvalidateAllIndices);
}
}

1
Userland/DevTools/Profiler/IndividualSampleModel.h
View file

@ -32,7 +32,6 @@ public:
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override;
private:
IndividualSampleModel(Profile&, size_t event_index);

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

@ -187,7 +187,7 @@ void Profile::rebuild_tree()
sort_profile_nodes(roots);
m_roots = move(roots);
m_model->update();
m_model->invalidate();
}
Result<NonnullOwnPtr<Profile>, String> Profile::load_from_perfcore_file(const StringView& path)
@ -378,7 +378,7 @@ void Profile::set_timestamp_filter_range(u64 start, u64 end)
m_timestamp_filter_range_end = max(start, end);
rebuild_tree();
m_samples_model->update();
m_samples_model->invalidate();
}
void Profile::clear_timestamp_filter_range()
@ -387,7 +387,7 @@ void Profile::clear_timestamp_filter_range()
return;
m_has_timestamp_filter_range = false;
rebuild_tree();
m_samples_model->update();
m_samples_model->invalidate();
}
void Profile::add_process_filter(pid_t pid, EventSerialNumber start_valid, EventSerialNumber end_valid)
@ -399,8 +399,8 @@ void Profile::add_process_filter(pid_t pid, EventSerialNumber start_valid, Event
rebuild_tree();
if (m_disassembly_model)
m_disassembly_model->update();
m_samples_model->update();
m_disassembly_model->invalidate();
m_samples_model->invalidate();
}
void Profile::remove_process_filter(pid_t pid, EventSerialNumber start_valid, EventSerialNumber end_valid)
@ -414,8 +414,8 @@ void Profile::remove_process_filter(pid_t pid, EventSerialNumber start_valid, Ev
rebuild_tree();
if (m_disassembly_model)
m_disassembly_model->update();
m_samples_model->update();
m_disassembly_model->invalidate();
m_samples_model->invalidate();
}
void Profile::clear_process_filter()
@ -425,8 +425,8 @@ void Profile::clear_process_filter()
m_process_filters.clear();
rebuild_tree();
if (m_disassembly_model)
m_disassembly_model->update();
m_samples_model->update();
m_disassembly_model->invalidate();
m_samples_model->invalidate();
}
bool Profile::process_filter_contains(pid_t pid, EventSerialNumber serial)

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

@ -135,9 +135,4 @@ GUI::Variant ProfileModel::data(const GUI::ModelIndex& index, GUI::ModelRole rol
return {};
}
void ProfileModel::update()
{
did_update(Model::InvalidateAllIndices);
}
}

1
Userland/DevTools/Profiler/ProfileModel.h
View file

@ -35,7 +35,6 @@ public:
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual GUI::ModelIndex index(int row, int column, const GUI::ModelIndex& parent = GUI::ModelIndex()) const override;
virtual GUI::ModelIndex parent_index(const GUI::ModelIndex&) const override;
virtual void update() override;
virtual int tree_column() const override { return Column::StackFrame; }
virtual bool is_column_sortable(int) const override { return false; }

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

@ -94,9 +94,4 @@ GUI::Variant SamplesModel::data(const GUI::ModelIndex& index, GUI::ModelRole rol
return {};
}
void SamplesModel::update()
{
did_update(Model::InvalidateAllIndices);
}
}

1
Userland/DevTools/Profiler/SamplesModel.h
View file

@ -36,7 +36,6 @@ public:
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override;
virtual bool is_column_sortable(int) const override { return false; }
private: