diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2017-05-18 14:49:04 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-12-05 00:47:44 +0100 |
commit | 105a66e6543467863a39cd12271f125b45d74179 (patch) | |
tree | 3362c298e5e930b6a7791584fe065aa0f8bd8a57 /src/widgets | |
parent | f19266bd02a01d4b7b277ea769c4c17727b1e661 (diff) |
Use (new) erase()/erase_if() algorithms
Change-Id: I45c18fd45c20b226e44d16315e3ebb6c305d4ab0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 7 | ||||
-rw-r--r-- | src/widgets/itemviews/qlistview.cpp | 7 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsstyle.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qabstractbutton.cpp | 4 |
4 files changed, 6 insertions, 14 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); } /* diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index ec252d9293..78e244307f 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -173,7 +173,7 @@ bool QWindowsStyle::eventFilter(QObject *o, QEvent *e) return w->isWindow() || !w->isVisible() || w->style()->styleHint(SH_UnderlineShortcut, nullptr, w); }; - l.erase(std::remove_if(l.begin(), l.end(), ignorable), l.end()); + l.removeIf(ignorable); // Update states before repainting d->seenAlt.append(widget); d->alt_down = true; diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 5ced1397b8..727cd66ed4 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -199,9 +199,7 @@ QList<QAbstractButton *>QAbstractButtonPrivate::queryButtonList() const #endif ; }; - candidates.erase(std::remove_if(candidates.begin(), candidates.end(), - isNoMemberOfMyAutoExclusiveGroup), - candidates.end()); + candidates.removeIf(isNoMemberOfMyAutoExclusiveGroup); } return candidates; } |