# HG changeset patch # User unc0rr # Date 1315223354 -14400 # Node ID 528dd4a14861a1a968d9c6728b7c5af54bd03dc8 # Parent 060d7572f9f67d0d6322c5344711bc1d80fc25bc Support Qt version which have no qHash(QUrl) diff -r 060d7572f9f6 -r 528dd4a14861 QTfrontend/databrowser.cpp --- a/QTfrontend/databrowser.cpp Sun Sep 04 17:26:38 2011 -0400 +++ b/QTfrontend/databrowser.cpp Mon Sep 05 15:49:14 2011 +0400 @@ -2,6 +2,7 @@ #include #include #include +#include #include "databrowser.h" @@ -19,15 +20,15 @@ { if(type == QTextDocument::ImageResource || type == QTextDocument::StyleSheetResource) { - if(resources.contains(name)) + if(resources.contains(name.toString())) { - return resources.take(name); + return resources.take(name.toString()); } else - if(!requestedResources.contains(name)) + if(!requestedResources.contains(name.toString())) { qDebug() << "Requesting resource" << name.toString(); - requestedResources.insert(name); + requestedResources.insert(name.toString()); QNetworkRequest newRequest(QUrl("http://www.hedgewars.org" + name.toString())); newRequest.setAttribute(typeAttribute, type); @@ -49,7 +50,7 @@ { int type = reply->request().attribute(typeAttribute).toInt(); QUrl url = reply->request().attribute(urlAttribute).toUrl(); - resources.insert(url, reply->readAll()); + resources.insert(url.toString(), reply->readAll()); document()->addResource(type, reply->request().url(), QVariant()); update(); } diff -r 060d7572f9f6 -r 528dd4a14861 QTfrontend/databrowser.h --- a/QTfrontend/databrowser.h Sun Sep 04 17:26:38 2011 -0400 +++ b/QTfrontend/databrowser.h Mon Sep 05 15:49:14 2011 +0400 @@ -18,8 +18,11 @@ private: QNetworkAccessManager *manager; - QHash resources; - QSet requestedResources; + + // hash and set of QString instead of QUrl to support Qt versions + // older than 4.7 (those have no support for qHash(const QUrl &)) + QHash resources; + QSet requestedResources; QVariant loadResource(int type, const QUrl & name);