diff options
| author | David Faure <faure@kde.org> | 2011-10-22 11:33:06 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-23 15:28:25 +0200 |
| commit | dfa24768a3243eda68d91f573050bf23f96da2dd (patch) | |
| tree | 40437c86c50a7ed1557caf8559129724899cd918 /tests/benchmarks/network | |
| parent | 59f91c0194f1ac83ae78e4b22f466e25873e1282 (diff) | |
Deprecate QDesktopServices::storageLocation/displayName
Which required porting the related unittests to qstandardpaths
Change-Id: I6eb63c46845f05cd29cc42b59872707526277c90
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
Diffstat (limited to 'tests/benchmarks/network')
| -rw-r--r-- | tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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() |