1 files changed, 7 insertions, 16 deletions
diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 1685838e9e..76a44fc812 100644
--- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -50,14 +50,12 @@ public:
     tst_QNetworkDiskCache();
 
 public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
     void accessAfterRemoveReadyReadSlot();
     void setCookieHeaderMetaDataChangedSlot();
 
 private slots:
+    void initTestCase();
+    void cleanupTestCase();
     void qnetworkdiskcache_data();
     void qnetworkdiskcache();
 
@@ -202,16 +200,6 @@ void tst_QNetworkDiskCache::cleanupTestCase()
         workingDir.removeRecursively();
 }
 
-// This will be called before each test function is executed.
-void tst_QNetworkDiskCache::init()
-{
-}
-
-// This will be called after every test function.
-void tst_QNetworkDiskCache::cleanup()
-{
-}
-
 void tst_QNetworkDiskCache::qnetworkdiskcache_data()
 {
 }
@@ -540,7 +528,7 @@ void tst_QNetworkDiskCache::expire()
     std::sort(cacheList.begin(), cacheList.end());
     for (int i = 0; i < cacheList.count(); ++i) {
         QString fileName = cacheList[i];
-        QCOMPARE(fileName, QString("http://localhost:4/%1").arg(i + 6));
+        QCOMPARE(fileName, QLatin1String("http://localhost:4/") + QString::number(i + 6));
     }
 }
 
@@ -782,7 +770,10 @@ void tst_QNetworkDiskCache::crashWhenParentingCache()
     QNetworkAccessManager *manager = new QNetworkAccessManager();
     QNetworkDiskCache *diskCache = new QNetworkDiskCache(manager); // parent to qnam!
     // we expect the temp dir to be cleaned at some point anyway
-    diskCache->setCacheDirectory(QString("%1/cacheDir_%2").arg(QDir::tempPath()).arg(QCoreApplication::applicationPid()));
+
+    const QString diskCachePath = QDir::tempPath() + QLatin1String("/cacheDir_")
+        + QString::number(QCoreApplication::applicationPid());
+    diskCache->setCacheDirectory(diskCachePath);
     manager->setCache(diskCache);
 
     QUrl url("http://127.0.0.1:" + QString::number(server.serverPort()));