dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use std::any_of

Browse Source
This commit is contained in:
Jonas Kvinge
2021-06-21 19:52:37 +02:00
parent 6a7959547e
commit c61d1ce6b4
12 changed files with 55 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/playlist/playlistfilterparser.cpp
View File

@@ -20,6 +20,8 @@
#include "config.h"
#include <algorithm>
#include <QList>
#include <QMap>
#include <QSet>
@@ -232,8 +234,8 @@ class OrFilter : public FilterTree {
~OrFilter() override { qDeleteAll(children_); }
virtual void add(FilterTree *child) { children_.append(child); }
bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override {
for (FilterTree *child : children_) {
if (child->accept(row, parent, model)) return true;
if (std::any_of(children_.begin(), children_.end(), [row, parent, model](FilterTree *child) { return child->accept(row, parent, model); })) {
return true;
}
return false;
}
@@ -247,8 +249,8 @@ class AndFilter : public FilterTree {
~AndFilter() override { qDeleteAll(children_); }
virtual void add(FilterTree *child) { children_.append(child); }
bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override {
for (FilterTree *child : children_) {
if (!child->accept(row, parent, model)) return false;
if (std::any_of(children_.begin(), children_.end(), [row, parent, model](FilterTree *child) { return !child->accept(row, parent, model); })) {
return false;
}
return true;
}