From dfa24768a3243eda68d91f573050bf23f96da2dd Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Sat, 22 Oct 2011 11:33:06 +0200
Subject: Deprecate QDesktopServices::storageLocation/displayName

Which required porting the related unittests to qstandardpaths

Change-Id: I6eb63c46845f05cd29cc42b59872707526277c90
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
---
 .../access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests/benchmarks/network')

diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 3e1168e6fc..a81c71550d 100644
--- a/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -47,7 +47,7 @@
 #include <QDebug>
 #include <QtTest/QtTest>
 #include <QIODevice>
-#include <QDesktopServices>
+#include <QStandardPaths>
 
 
 
@@ -109,8 +109,8 @@ void tst_qnetworkdiskcache::timeInsertion_data()
 {
     QTest::addColumn<QString>("cacheRootDirectory");
 
-    QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
-    QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
+    QString cacheLoc = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+    QTest::newRow("QStandardPaths Cache Location") << cacheLoc;
 }
 
 //This functions times an insert() operation.
@@ -170,8 +170,8 @@ void tst_qnetworkdiskcache::timeRead_data()
 {
     QTest::addColumn<QString>("cacheRootDirectory");
 
-    QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
-    QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
+    QString cacheLoc = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+    QTest::newRow("QStandardPaths Cache Location") << cacheLoc;
 }
 
 //Times metadata as well payload lookup
@@ -229,8 +229,8 @@ void tst_qnetworkdiskcache::timeRemoval_data()
 {
     QTest::addColumn<QString>("cacheRootDirectory");
 
-    QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
-    QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
+    QString cacheLoc = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+    QTest::newRow("QStandardPaths Cache Location") << cacheLoc;
 }
 
 void tst_qnetworkdiskcache::timeRemoval()
@@ -279,8 +279,8 @@ void tst_qnetworkdiskcache::timeExpiration_data()
 {
     QTest::addColumn<QString>("cacheRootDirectory");
 
-    QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
-    QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
+    QString cacheLoc = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+    QTest::newRow("QStandardPaths Cache Location") << cacheLoc;
 }
 
 void tst_qnetworkdiskcache::timeExpiration()
-- 
cgit v1.2.3