New upstream version 2.9

[minitube] / src / diskcache.cpp

diff --git a/src/diskcache.cpp b/src/diskcache.cpp
index fda8a8702cfb7e5c72fa0d608897cf8429a58e36..61fb8917ca84bd8b012092316f3e114d7bb2e885 100644 (file)
--- a/src/diskcache.cpp
+++ b/src/diskcache.cpp
@@ -20,13 +20,13 @@ $END_LICENSE */
 
 #include "diskcache.h"
 #include <QtNetwork>
-#include "compatibility/qurlqueryhelper.h"
 
 DiskCache::DiskCache(QObject *parent) : QNetworkDiskCache(parent) { }
 
 QIODevice* DiskCache::prepare(const QNetworkCacheMetaData &metaData) {
     QString mime;
-    foreach (const QNetworkCacheMetaData::RawHeader &header, metaData.rawHeaders()) {
+    const auto headers = metaData.rawHeaders();
+    for (const QNetworkCacheMetaData::RawHeader &header : headers) {
         // qDebug() << header.first << header.second;
         if (header.first.constData() == QLatin1String("Content-Type")) {
             mime = header.second;
@@ -44,10 +44,11 @@ QIODevice* DiskCache::prepare(const QNetworkCacheMetaData &metaData) {
 QNetworkCacheMetaData DiskCache::metaData(const QUrl &url) {
     // Remove "key" from query string in order to reuse cache when key changes
     static const QString keyQueryItem = "key";
-    QUrl url2(url);
-    QUrlQueryHelper urlHelper(url2);
-    if (urlHelper.hasQueryItem(keyQueryItem)) {
-        urlHelper.removeQueryItem(keyQueryItem);
+    QUrlQuery q(url);
+    if (q.hasQueryItem(keyQueryItem)) {
+        q.removeQueryItem(keyQueryItem);
+        QUrl url2(url);
+        url2.setQuery(q);
         return QNetworkDiskCache::metaData(url2);
     }