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

LibGUI: Make FilteringProxyModel reference-count its parent model

Browse source 
Before this change, the destructor of FilteringProxyModel
would crash if the parent model had been destroyed earlier.

This unifies the behaviour of FilteringProxyModel with
SortingProxyModel in this respect.
This commit is contained in:
Martin Blicha 2021-12-02 21:16:26 +01:00 • committed by Andreas Kling
parent 6b32b775bf
commit 8fb52c6962
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibGUI/FilteringProxyModel.cpp
View file

@ -30,7 +30,7 @@ int FilteringProxyModel::column_count(ModelIndex const& index) const
if ((size_t)index.row() > m_matching_indices.size() || index.row() < 0) if ((size_t)index.row() > m_matching_indices.size() || index.row() < 0)
return 0; return 0;
return m_model.column_count(m_matching_indices[index.row()]); return m_model->column_count(m_matching_indices[index.row()]);
} }
Variant FilteringProxyModel::data(ModelIndex const& index, ModelRole role) const Variant FilteringProxyModel::data(ModelIndex const& index, ModelRole role) const
@ -55,12 +55,12 @@ void FilteringProxyModel::filter()
m_matching_indices.clear(); m_matching_indices.clear();
Function<void(ModelIndex&)> add_matching = [&](ModelIndex& parent_index) { Function<void(ModelIndex&)> add_matching = [&](ModelIndex& parent_index) {
for (auto i = 0; i < m_model.row_count(parent_index); ++i) { for (auto i = 0; i < m_model->row_count(parent_index); ++i) {
auto index = m_model.index(i, 0, parent_index); auto index = m_model->index(i, 0, parent_index);
if (!index.is_valid()) if (!index.is_valid())
continue; continue;
auto filter_matches = m_model.data_matches(index, m_filter_term); auto filter_matches = m_model->data_matches(index, m_filter_term);
bool matches = filter_matches == TriState::True; bool matches = filter_matches == TriState::True;
if (filter_matches == TriState::Unknown) { if (filter_matches == TriState::Unknown) {
auto data = index.data(); auto data = index.data();
@ -100,12 +100,12 @@ ModelIndex FilteringProxyModel::map(ModelIndex const& index) const
bool FilteringProxyModel::is_searchable() const bool FilteringProxyModel::is_searchable() const
{ {
return m_model.is_searchable(); return m_model->is_searchable();
} }
Vector<ModelIndex> FilteringProxyModel::matches(StringView searching, unsigned flags, ModelIndex const& index) Vector<ModelIndex> FilteringProxyModel::matches(StringView searching, unsigned flags, ModelIndex const& index)
{ {
auto found_indices = m_model.matches(searching, flags, index); auto found_indices = m_model->matches(searching, flags, index);
for (size_t i = 0; i < found_indices.size(); i++) for (size_t i = 0; i < found_indices.size(); i++)
found_indices[i] = map(found_indices[i]); found_indices[i] = map(found_indices[i]);
return found_indices; return found_indices;

14
Userland/Libraries/LibGUI/FilteringProxyModel.h
View file

@ -17,14 +17,14 @@ namespace GUI {
class FilteringProxyModel final : public Model class FilteringProxyModel final : public Model
, public ModelClient { , public ModelClient {
public: public:
static ErrorOr<NonnullRefPtr<FilteringProxyModel>> create(Model& model) static ErrorOr<NonnullRefPtr<FilteringProxyModel>> create(NonnullRefPtr<Model> model)
{ {
return adopt_nonnull_ref_or_enomem(new (nothrow) FilteringProxyModel(model)); return adopt_nonnull_ref_or_enomem(new (nothrow) FilteringProxyModel(move(model)));
} }
virtual ~FilteringProxyModel() override virtual ~FilteringProxyModel() override
{ {
m_model.unregister_client(*this); m_model->unregister_client(*this);
}; };
virtual int row_count(ModelIndex const& = ModelIndex()) const override; virtual int row_count(ModelIndex const& = ModelIndex()) const override;
@ -44,13 +44,13 @@ protected:
private: private:
void filter(); void filter();
explicit FilteringProxyModel(Model& model) explicit FilteringProxyModel(NonnullRefPtr<Model> model)
: m_model(model) : m_model(move(model))
{ {
m_model.register_client(*this); m_model->register_client(*this);
} }
Model& m_model; NonnullRefPtr<Model> m_model;
// Maps row to actual model index. // Maps row to actual model index.
Vector<ModelIndex> m_matching_indices; Vector<ModelIndex> m_matching_indices;