tests: remove the last uses of Java-style iterators

... except where they are actually the component under test.

Java-style iterators are scheduled for deprecation.

Change-Id: If4399f7f74c5ffc0f7e65205e422edfa1d908ee8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 
 
 

2 files changed, 7 insertions, 12 deletions

diff --git a/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.cpp b/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.cpp
index fc979bce2d..c8698242d5 100644
--- a/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.cpp
+++ b/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.cpp
@@ -80,13 +80,9 @@ qint64 DynamicTreeModel::findParentId(qint64 searchId) const
     if (searchId <= 0)
         return -1;
 
-    QHashIterator<qint64, QList<QList<qint64> > > i(m_childItems);
-    while (i.hasNext()) {
-        i.next();
-        QListIterator<QList<qint64> > j(i.value());
-        while (j.hasNext()) {
-            QList<qint64> l = j.next();
-            if (l.contains(searchId))
+    for (auto i = m_childItems.cbegin(), end = m_childItems.cend(); i != end; ++i) {
+        for (const auto &list : i.value()) {
+            if (list.contains(searchId))
                 return i.key();
         }
     }
@@ -163,13 +159,12 @@ ModelChangeCommand::ModelChangeCommand(DynamicTreeModel *model, QObject *parent)
 {
 }
 
-QModelIndex ModelChangeCommand::findIndex(QList<int> rows)
+QModelIndex ModelChangeCommand::findIndex(const QList<int> &rows) const
 {
     const int col = 0;
     QModelIndex parent = QModelIndex();
-    QListIterator<int> i(rows);
-    while (i.hasNext()) {
-        parent = m_model->index(i.next(), col, parent);
+    for (int row : rows) {
+        parent = m_model->index(row, col, parent);
         if (!parent.isValid())
             qFatal("%s: parent must be valid", Q_FUNC_INFO);
     }
diff --git a/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.h b/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.h
index 709751dd27..0807ffbe94 100644
--- a/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.h
+++ b/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.h
@@ -97,7 +97,7 @@ public:
         m_rowNumbers = rowNumbers;
     }
 
-    QModelIndex findIndex(QList<int> rows);
+    QModelIndex findIndex(const QList<int> &rows) const;
 
     void setStartRow(int row)
     {