diff options
-rw-r--r-- | Userland/Libraries/LibGUI/FileSystemModel.cpp | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/FileSystemModel.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/FilteringProxyModel.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/FilteringProxyModel.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/ItemListModel.h | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/Model.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/SortingProxyModel.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/SortingProxyModel.h | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/Userland/Libraries/LibGUI/FileSystemModel.cpp b/Userland/Libraries/LibGUI/FileSystemModel.cpp index 279ec09e37..bd9f23df63 100644 --- a/Userland/Libraries/LibGUI/FileSystemModel.cpp +++ b/Userland/Libraries/LibGUI/FileSystemModel.cpp @@ -738,11 +738,11 @@ void FileSystemModel::set_data(const ModelIndex& index, const Variant& data) } } -Vector<ModelIndex, 1> FileSystemModel::matches(const StringView& searching, unsigned flags, const ModelIndex& index) +Vector<ModelIndex> FileSystemModel::matches(const StringView& searching, unsigned flags, const ModelIndex& index) { Node& node = const_cast<Node&>(this->node(index)); node.reify_if_needed(); - Vector<ModelIndex, 1> found_indices; + Vector<ModelIndex> found_indices; for (auto& child : node.m_children) { if (string_matches(child.name, searching, flags)) { const_cast<Node&>(child).reify_if_needed(); diff --git a/Userland/Libraries/LibGUI/FileSystemModel.h b/Userland/Libraries/LibGUI/FileSystemModel.h index e6e62f5d81..f3cff39e6b 100644 --- a/Userland/Libraries/LibGUI/FileSystemModel.h +++ b/Userland/Libraries/LibGUI/FileSystemModel.h @@ -132,7 +132,7 @@ public: virtual bool is_editable(const ModelIndex&) const override; virtual bool is_searchable() const override { return true; } virtual void set_data(const ModelIndex&, const Variant&) override; - virtual Vector<ModelIndex, 1> matches(const StringView&, unsigned = MatchesFlag::AllMatching, const ModelIndex& = ModelIndex()) override; + virtual Vector<ModelIndex> matches(const StringView&, unsigned = MatchesFlag::AllMatching, const ModelIndex& = ModelIndex()) override; virtual void invalidate() override; static String timestamp_string(time_t timestamp) diff --git a/Userland/Libraries/LibGUI/FilteringProxyModel.cpp b/Userland/Libraries/LibGUI/FilteringProxyModel.cpp index eb66668aa0..5996fc5dc2 100644 --- a/Userland/Libraries/LibGUI/FilteringProxyModel.cpp +++ b/Userland/Libraries/LibGUI/FilteringProxyModel.cpp @@ -104,7 +104,7 @@ bool FilteringProxyModel::is_searchable() const return m_model.is_searchable(); } -Vector<ModelIndex, 1> FilteringProxyModel::matches(const StringView& searching, unsigned flags, const ModelIndex& index) +Vector<ModelIndex> FilteringProxyModel::matches(const StringView& searching, unsigned flags, const ModelIndex& index) { auto found_indices = m_model.matches(searching, flags, index); for (size_t i = 0; i < found_indices.size(); i++) diff --git a/Userland/Libraries/LibGUI/FilteringProxyModel.h b/Userland/Libraries/LibGUI/FilteringProxyModel.h index 31b06b1069..ebffa7cad1 100644 --- a/Userland/Libraries/LibGUI/FilteringProxyModel.h +++ b/Userland/Libraries/LibGUI/FilteringProxyModel.h @@ -29,7 +29,7 @@ public: virtual void invalidate() override; virtual ModelIndex index(int row, int column = 0, const ModelIndex& parent = ModelIndex()) const override; virtual bool is_searchable() const override; - virtual Vector<ModelIndex, 1> matches(const StringView&, unsigned = MatchesFlag::AllMatching, const ModelIndex& = ModelIndex()) override; + virtual Vector<ModelIndex> matches(const StringView&, unsigned = MatchesFlag::AllMatching, const ModelIndex& = ModelIndex()) override; void set_filter_term(const StringView& term); diff --git a/Userland/Libraries/LibGUI/ItemListModel.h b/Userland/Libraries/LibGUI/ItemListModel.h index 1f5ecc0c41..c51f097c2d 100644 --- a/Userland/Libraries/LibGUI/ItemListModel.h +++ b/Userland/Libraries/LibGUI/ItemListModel.h @@ -78,9 +78,9 @@ public: } virtual bool is_searchable() const override { return true; } - virtual Vector<GUI::ModelIndex, 1> matches(StringView const& searching, unsigned flags, GUI::ModelIndex const&) override + virtual Vector<GUI::ModelIndex> matches(StringView const& searching, unsigned flags, GUI::ModelIndex const&) override { - Vector<GUI::ModelIndex, 1> found_indices; + Vector<GUI::ModelIndex> found_indices; if constexpr (IsTwoDimensional) { for (auto it = m_data.begin(); it != m_data.end(); ++it) { for (auto it2d = (*it).begin(); it2d != (*it).end(); ++it2d) { diff --git a/Userland/Libraries/LibGUI/Model.h b/Userland/Libraries/LibGUI/Model.h index 1f6bc10fa1..3c68159d38 100644 --- a/Userland/Libraries/LibGUI/Model.h +++ b/Userland/Libraries/LibGUI/Model.h @@ -75,7 +75,7 @@ public: virtual void set_data(const ModelIndex&, const Variant&) { } virtual int tree_column() const { return 0; } virtual bool accepts_drag(const ModelIndex&, const Vector<String>& mime_types) const; - virtual Vector<ModelIndex, 1> matches(const StringView&, unsigned = MatchesFlag::AllMatching, const ModelIndex& = ModelIndex()) { return {}; } + virtual Vector<ModelIndex> matches(const StringView&, unsigned = MatchesFlag::AllMatching, const ModelIndex& = ModelIndex()) { return {}; } virtual bool is_column_sortable([[maybe_unused]] int column_index) const { return true; } virtual void sort([[maybe_unused]] int column, SortOrder) { } diff --git a/Userland/Libraries/LibGUI/SortingProxyModel.cpp b/Userland/Libraries/LibGUI/SortingProxyModel.cpp index 5415ab0fed..f84080eb02 100644 --- a/Userland/Libraries/LibGUI/SortingProxyModel.cpp +++ b/Userland/Libraries/LibGUI/SortingProxyModel.cpp @@ -288,7 +288,7 @@ bool SortingProxyModel::is_searchable() const return source().is_searchable(); } -Vector<ModelIndex, 1> SortingProxyModel::matches(const StringView& searching, unsigned flags, const ModelIndex& proxy_index) +Vector<ModelIndex> SortingProxyModel::matches(const StringView& searching, unsigned flags, const ModelIndex& proxy_index) { auto found_indices = source().matches(searching, flags, map_to_source(proxy_index)); for (size_t i = 0; i < found_indices.size(); i++) diff --git a/Userland/Libraries/LibGUI/SortingProxyModel.h b/Userland/Libraries/LibGUI/SortingProxyModel.h index 27d6c35132..3f74ed5ff4 100644 --- a/Userland/Libraries/LibGUI/SortingProxyModel.h +++ b/Userland/Libraries/LibGUI/SortingProxyModel.h @@ -28,7 +28,7 @@ public: virtual bool is_editable(const ModelIndex&) const override; virtual bool is_searchable() const override; virtual void set_data(const ModelIndex&, const Variant&) override; - virtual Vector<ModelIndex, 1> matches(const StringView&, unsigned = MatchesFlag::AllMatching, const ModelIndex& = ModelIndex()) override; + virtual Vector<ModelIndex> matches(const StringView&, unsigned = MatchesFlag::AllMatching, const ModelIndex& = ModelIndex()) override; virtual bool accepts_drag(const ModelIndex&, const Vector<String>& mime_types) const override; virtual bool is_column_sortable(int column_index) const override; |