QtBase: use erase and std::remove_if with QList and QVector

... instead of using removeAt in a loop, with quadratic complexity.

Change-Id: I38b49e56b12c396db9fc0f1b75d8fb43c503a7f6
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index b2aacfa5aa..56df8fd55a 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -1717,15 +1717,15 @@ const QItemSelection QItemSelectionModel::selection() const
     Q_D(const QItemSelectionModel);
     QItemSelection selected = d->ranges;
     selected.merge(d->currentSelection, d->currentCommand);
-    int i = 0;
     // make sure we have no invalid ranges
     // ###  should probably be handled more generic somewhere else
-    while (i<selected.count()) {
-        if (selected.at(i).isValid())
-            ++i;
-        else
-            (selected.removeAt(i));
-    }
+    auto isNotValid = [](const QItemSelectionRange& range) {
+        return !range.isValid();
+    };
+
+    selected.erase(std::remove_if(selected.begin(), selected.end(),
+                                  isNotValid),
+                   selected.end());
     return selected;
 }