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>

tests/auto/corelib/global/qlogging/tst_qlogging.cpp

@@ -870,12 +870,14 @@ void tst_qmessagehandler::setMessagePattern()
 #endif
 
     // make sure there is no QT_MESSAGE_PATTERN in the environment
-    QStringList environment = m_baseEnvironment;
+    QStringList environment;
-    QMutableListIterator<QString> iter(environment);
+    environment.reserve(m_baseEnvironment.size());
-    while (iter.hasNext()) {
+    const auto doesNotStartWith = [](QLatin1String s) {
-        if (iter.next().startsWith("QT_MESSAGE_PATTERN"))
+        return [s](const QString &str) { return !str.startsWith(s); };
-            iter.remove();
+    };
-    }
+    std::copy_if(m_baseEnvironment.cbegin(), m_baseEnvironment.cend(),
+                 std::back_inserter(environment),
+                 doesNotStartWith(QLatin1String("QT_MESSAGE_PATTERN")));
     process.setEnvironment(environment);
 
     process.start(appExe);

tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp

@@ -4147,10 +4147,10 @@ void tst_QNetworkReply::ioGetFromHttpWithCache()
     request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false);
 
     QFETCH(QStringList, extraHttpHeaders);
-    QStringListIterator it(extraHttpHeaders);
+    QVERIFY(extraHttpHeaders.size() % 2 == 0);
-    while (it.hasNext()) {
+    for (auto it = extraHttpHeaders.cbegin(), end = extraHttpHeaders.cend(); it != end; /*double-stepping*/) {
-        QString header = it.next();
+        QString header = *it++;
-        QString value = it.next();
+        QString value = *it++;
         request.setRawHeader(header.toLatin1(), value.toLatin1()); // To latin1? Deal with it!
     }
 

tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp

@@ -401,9 +401,7 @@ void tst_QSslCertificate::subjectAlternativeNames()
         certificate.subjectAlternativeNames();
 
     // verify that each entry in subjAltNames is present in fileContents
-    QMapIterator<QSsl::AlternativeNameEntryType, QString> it(altSubjectNames);
+    for (auto it = altSubjectNames.cbegin(), end = altSubjectNames.cend(); it != end; ++it) {
-    while (it.hasNext()) {
-        it.next();
         QByteArray type;
         if (it.key() == QSsl::EmailEntry)
             type = "email";

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);
+    for (auto i = m_childItems.cbegin(), end = m_childItems.cend(); i != end; ++i) {
-    while (i.hasNext()) {
+        for (const auto &list : i.value()) {
-        i.next();
+            if (list.contains(searchId))
-        QListIterator<QList<qint64> > j(i.value());
-        while (j.hasNext()) {
-            QList<qint64> l = j.next();
-            if (l.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);
+    for (int row : rows) {
-    while (i.hasNext()) {
+        parent = m_model->index(row, col, parent);
-        parent = m_model->index(i.next(), col, parent);
         if (!parent.isValid())
             qFatal("%s: parent must be valid", Q_FUNC_INFO);
     }

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)
     {

tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp

@@ -167,9 +167,7 @@ void tst_QTransform::func##_data() \
 { \
     QTest::addColumn<QTransform>("transform"); \
     QMap<const char *, QTransform> x = generateTransforms(); \
-    QMapIterator<const char *, QTransform> it(x); \
+    for (auto it = x.begin(), end = x.end(); it != end; ++it) { \
-    while (it.hasNext()) { \
-        it.next(); \
         QTest::newRow(it.key()) << it.value(); \
     } \
 }
@@ -180,14 +178,10 @@ void tst_QTransform::func##_data() \
     QTest::addColumn<QTransform>("x1"); \
     QTest::addColumn<QTransform>("x2"); \
     QMap<const char *, QTransform> x = generateTransforms(); \
-    QMapIterator<const char *, QTransform> it(x); \
+    for (auto it = x.cbegin(), end = x.cend(); it != end; ++it) { \
-    while (it.hasNext()) { \
-        it.next(); \
         const char *key1 = it.key(); \
         QTransform x1 = it.value(); \
-        QMapIterator<const char *, QTransform> it2(x); \
+        for (auto it2 = x.cbegin(), end = x.cend(); it2 != end; ++it2) { \
-        while (it2.hasNext()) { \
-            it2.next(); \
             QTest::newRow(QString("%1 + %2").arg(key1).arg(it2.key()).toLatin1().constData()) \
                 << x1 << it2.value(); \
         } \