1 files changed, 21 insertions, 24 deletions

diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 5f4a513a28..ec32c780cd 100644
--- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtNetwork/QtNetwork>
 #include <QTest>
@@ -12,7 +12,7 @@
 #define EXAMPLE_URL "http://user:pass@localhost:4/#foo"
 #define EXAMPLE_URL2 "http://user:pass@localhost:4/bar"
 //cached objects are organized into these many subdirs
-#define NUM_SUBDIRECTORIES 16
+#define NUM_SUBDIRECTORIES 15
 
 class tst_QNetworkDiskCache : public QObject
 {
@@ -278,17 +278,17 @@ void tst_QNetworkDiskCache::clear()
     QVERIFY(cache.cacheSize() > qint64(0));
 
     QString cacheDirectory = cache.cacheDirectory();
-    QCOMPARE(countFiles(cacheDirectory).count(), NUM_SUBDIRECTORIES + 3);
+    QCOMPARE(countFiles(cacheDirectory).size(), NUM_SUBDIRECTORIES + 3);
     cache.clear();
-    QCOMPARE(countFiles(cacheDirectory).count(), NUM_SUBDIRECTORIES + 2);
+    QCOMPARE(countFiles(cacheDirectory).size(), NUM_SUBDIRECTORIES + 2);
 
     // don't delete files that it didn't create
     QTemporaryFile file(cacheDirectory + "/XXXXXX");
     if (file.open()) {
         file.fileName();    // make sure it exists with a name
-        QCOMPARE(countFiles(cacheDirectory).count(), NUM_SUBDIRECTORIES + 3);
+        QCOMPARE(countFiles(cacheDirectory).size(), NUM_SUBDIRECTORIES + 3);
         cache.clear();
-        QCOMPARE(countFiles(cacheDirectory).count(), NUM_SUBDIRECTORIES + 3);
+        QCOMPARE(countFiles(cacheDirectory).size(), NUM_SUBDIRECTORIES + 3);
     }
 }
 
@@ -355,9 +355,9 @@ void tst_QNetworkDiskCache::remove()
     QUrl url(EXAMPLE_URL);
     cache.setupWithOne(tempDir.path(), url);
     QString cacheDirectory = cache.cacheDirectory();
-    QCOMPARE(countFiles(cacheDirectory).count(), NUM_SUBDIRECTORIES + 3);
+    QCOMPARE(countFiles(cacheDirectory).size(), NUM_SUBDIRECTORIES + 3);
     cache.remove(url);
-    QCOMPARE(countFiles(cacheDirectory).count(), NUM_SUBDIRECTORIES + 2);
+    QCOMPARE(countFiles(cacheDirectory).size(), NUM_SUBDIRECTORIES + 2);
 }
 
 void tst_QNetworkDiskCache::accessAfterRemove() // QTBUG-17400
@@ -476,9 +476,9 @@ void tst_QNetworkDiskCache::fileMetaData()
     url.setFragment(QString());
 
     QString cacheDirectory = cache.cacheDirectory();
-    QStringList list = countFiles(cacheDirectory);
-    QCOMPARE(list.count(), NUM_SUBDIRECTORIES + 3);
-    foreach(QString fileName, list) {
+    const QStringList list = countFiles(cacheDirectory);
+    QCOMPARE(list.size(), NUM_SUBDIRECTORIES + 3);
+    for (const QString &fileName : list) {
         QFileInfo info(fileName);
         if (info.isFile()) {
             QNetworkCacheMetaData metaData = cache.call_fileMetaData(fileName);
@@ -521,9 +521,9 @@ void tst_QNetworkDiskCache::expire()
     }
 
     QString cacheDirectory = cache.cacheDirectory();
-    QStringList list = countFiles(cacheDirectory);
+    const QStringList list = countFiles(cacheDirectory);
     QStringList cacheList;
-    foreach(QString fileName, list) {
+    for (const QString &fileName : list) {
         QFileInfo info(fileName);
         if (info.isFile()) {
             QNetworkCacheMetaData metaData = cache.call_fileMetaData(fileName);
@@ -531,7 +531,7 @@ void tst_QNetworkDiskCache::expire()
         }
     }
     std::sort(cacheList.begin(), cacheList.end());
-    for (int i = 0; i < cacheList.count(); ++i) {
+    for (int i = 0; i < cacheList.size(); ++i) {
         QString fileName = cacheList[i];
         QCOMPARE(fileName, QLatin1String("http://localhost:4/") + QString::number(i + 6));
     }
@@ -569,11 +569,11 @@ void tst_QNetworkDiskCache::oldCacheVersionFile()
         QVERIFY(!metaData.isValid());
         QVERIFY(!QFile::exists(name));
     } else {
-        QStringList files = countFiles(cache.cacheDirectory());
-        QCOMPARE(files.count(), NUM_SUBDIRECTORIES + 3);
+        const QStringList files = countFiles(cache.cacheDirectory());
+        QCOMPARE(files.size(), NUM_SUBDIRECTORIES + 3);
         // find the file
         QString cacheFile;
-        foreach (QString file, files) {
+        for (const QString &file : files) {
             QFileInfo info(file);
             if (info.isFile())
                 cacheFile = file;
@@ -610,8 +610,8 @@ void tst_QNetworkDiskCache::streamVersion()
 
     QString cacheFile;
     // find the file
-    QStringList files = countFiles(cache.cacheDirectory());
-    foreach (const QString &file, files) {
+    const QStringList files = countFiles(cache.cacheDirectory());
+    for (const QString &file : files) {
         QFileInfo info(file);
         if (info.isFile()) {
             cacheFile = file;
@@ -657,6 +657,7 @@ void tst_QNetworkDiskCache::streamVersion()
         QIODevice *dataDevice = cache.data(url);
         QVERIFY(dataDevice != 0);
         QByteArray cachedData = dataDevice->readAll();
+        delete dataDevice;
         QCOMPARE(cachedData, data);
     }
 }
@@ -693,8 +694,6 @@ public:
         QNetworkDiskCache cache;
         cache.setCacheDirectory(cachePath);
 
-        int read = 0;
-
         int i = 0;
         for (; i < 5000; ++i) {
             if (other && other->isFinished())
@@ -745,7 +744,6 @@ public:
                     }
                     if (gotMetaData.isValid())
                         QVERIFY(x == longString || x == longString2);
-                    read++;
                     delete d;
                 }
             }
@@ -753,9 +751,8 @@ public:
                 cache.remove(url);
             if (QRandomGenerator::global()->bounded(5) == 1)
                 cache.clear();
-            sleep(0);
+            sleep(std::chrono::seconds{0});
         }
-        //qDebug() << "read!" << read << i;
     }
 
     QDateTime dt;