From 36f925aac11e6d023c2b7d3ba4a0440b8b5d717d Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samirh78@gmail.com>
Date: Fri, 11 Aug 2023 23:14:21 +0300
Subject: [PATCH] QtNetwork auto tests: port Q_FOREACH to ranged-for [3]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In both cases, the container is a member of the unittest, initialized in
initTestCase(), then not changed after that. So use std::as_const.

Task-number: QTBUG-115839
Change-Id: I3b66127e10ac94137260d99f354de9f66a74bec7
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 .../network/ssl/qsslcertificate/tst_qsslcertificate.cpp   | 8 ++++----
 tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
index 45217ad1ea..3b07c28bae 100644
--- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
@@ -209,7 +209,7 @@ void tst_QSslCertificate::createTestRows()
 {
     QTest::addColumn<QString>("absFilePath");
     QTest::addColumn<QSsl::EncodingFormat>("format");
-    foreach (CertInfo certInfo, certInfoList) {
+    for (const CertInfo &certInfo : std::as_const(certInfoList)) {
         QTest::newRow(certInfo.fileInfo.fileName().toLatin1())
             << certInfo.fileInfo.absoluteFilePath() << certInfo.format;
     }
@@ -340,7 +340,7 @@ void tst_QSslCertificate::digest_data()
     QTest::addColumn<QSsl::EncodingFormat>("format");
     QTest::addColumn<QString>("absFilePath_digest_md5");
     QTest::addColumn<QString>("absFilePath_digest_sha1");
-    foreach (CertInfo certInfo, certInfoList) {
+    for (const CertInfo &certInfo : std::as_const(certInfoList)) {
         QString certName = certInfo.fileInfo.fileName();
         QTest::newRow(certName.toLatin1())
             << certInfo.fileInfo.absoluteFilePath()
@@ -393,7 +393,7 @@ void tst_QSslCertificate::subjectAlternativeNames_data()
     QTest::addColumn<QSsl::EncodingFormat>("format");
     QTest::addColumn<QString>("subjAltNameFilePath");
 
-    foreach (CertInfo certInfo, certInfoList) {
+    for (const CertInfo &certInfo : std::as_const(certInfoList)) {
         QString certName = certInfo.fileInfo.fileName();
         if (subjAltNameMap.contains(certName))
             QTest::newRow(certName.toLatin1())
@@ -531,7 +531,7 @@ void tst_QSslCertificate::publicKey_data()
     QTest::addColumn<QSsl::EncodingFormat>("format");
     QTest::addColumn<QString>("pubkeyFilePath");
 
-    foreach (CertInfo certInfo, certInfoList) {
+    for (const CertInfo &certInfo : std::as_const(certInfoList)) {
         QString certName = certInfo.fileInfo.fileName();
         if (pubkeyMap.contains(certName))
             QTest::newRow(certName.toLatin1())
diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
index d8296ca267..a825790782 100644
--- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
@@ -251,7 +251,7 @@ void tst_QSslKey::createPlainTestRows(bool pemOnly)
     QTest::addColumn<QSsl::KeyType>("type");
     QTest::addColumn<int>("length");
     QTest::addColumn<QSsl::EncodingFormat>("format");
-    foreach (KeyInfo keyInfo, keyInfoList) {
+    for (const KeyInfo &keyInfo : std::as_const(keyInfoList)) {
         if (pemOnly && keyInfo.format != QSsl::EncodingFormat::Pem)
             continue;
 
@@ -472,7 +472,7 @@ void tst_QSslKey::toEncryptedPemOrDer_data()
     QStringList passwords;
     passwords << " " << "foobar" << "foo bar"
               << "aAzZ`1234567890-=~!@#$%^&*()_+[]{}\\|;:'\",.<>/?"; // ### add more (?)
-    foreach (KeyInfo keyInfo, keyInfoList) {
+    for (const KeyInfo &keyInfo : std::as_const(keyInfoList)) {
         if (keyInfo.fileInfo.fileName().contains("pkcs8"))
             continue; // pkcs8 keys are encrypted in a different way than the other keys
         foreach (QString password, passwords) {