diff options
Diffstat (limited to 'src/widgets/itemviews')
-rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 7 | ||||
-rw-r--r-- | src/widgets/itemviews/qlistview.cpp | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 2e0ddf678f..8f8f597d11 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -2642,8 +2642,7 @@ QModelIndexList QAbstractItemView::selectedIndexes() const auto isHidden = [this](const QModelIndex &idx) { return isIndexHidden(idx); }; - const auto end = indexes.end(); - indexes.erase(std::remove_if(indexes.begin(), end, isHidden), end); + indexes.removeIf(isHidden); } return indexes; } @@ -4489,9 +4488,7 @@ QModelIndexList QAbstractItemViewPrivate::selectedDraggableIndexes() const auto isNotDragEnabled = [this](const QModelIndex &index) { return !isIndexDragEnabled(index); }; - indexes.erase(std::remove_if(indexes.begin(), indexes.end(), - isNotDragEnabled), - indexes.end()); + indexes.removeIf(isNotDragEnabled); return indexes; } diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp index 5e400e5c8f..269f08ce9f 100644 --- a/src/widgets/itemviews/qlistview.cpp +++ b/src/widgets/itemviews/qlistview.cpp @@ -1522,8 +1522,7 @@ QModelIndexList QListView::selectedIndexes() const auto ignorable = [this, d](const QModelIndex &index) { return index.column() != d->column || index.parent() != d->root || isIndexHidden(index); }; - viewSelected.erase(std::remove_if(viewSelected.begin(), viewSelected.end(), ignorable), - viewSelected.end()); + viewSelected.removeIf(ignorable); return viewSelected; } @@ -1960,9 +1959,7 @@ void QListViewPrivate::removeCurrentAndDisabled(QList<QModelIndex> *indexes, auto isCurrentOrDisabled = [this, current](const QModelIndex &index) { return !isIndexEnabled(index) || index == current; }; - indexes->erase(std::remove_if(indexes->begin(), indexes->end(), - isCurrentOrDisabled), - indexes->end()); + indexes->removeIf(isCurrentOrDisabled); } /* |