New upstream version 3.1

[minitube] / src / diskcache.cpp

diff --git a/src/diskcache.cpp b/src/diskcache.cpp
index 4766b008635f3c5c8dc988914dfd35ae389fe939..61fb8917ca84bd8b012092316f3e114d7bb2e885 100644 (file)
--- a/src/diskcache.cpp
+++ b/src/diskcache.cpp
@@ -25,7 +25,8 @@ 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;
@@ -43,10 +44,13 @@ 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";
-    if (url.hasQueryItem(keyQueryItem)) {
+    QUrlQuery q(url);
+    if (q.hasQueryItem(keyQueryItem)) {
+        q.removeQueryItem(keyQueryItem);
         QUrl url2(url);
-        url2.removeQueryItem(keyQueryItem);
+        url2.setQuery(q);
         return QNetworkDiskCache::metaData(url2);
     }
+
     return QNetworkDiskCache::metaData(url);
 }