summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-04-04 11:37:30 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2011-04-04 11:49:43 (GMT)
commit153bf90ea0fc5f58c27c82e13dc1c4d73b028f5e (patch)
tree2eb6bbf4937eb7cd216baa2c25e90c69efcba829 /src/network/access
parent12a0099dfb8242d0296ccef1a78d75327ff8fe03 (diff)
downloadQt-153bf90ea0fc5f58c27c82e13dc1c4d73b028f5e.zip
Qt-153bf90ea0fc5f58c27c82e13dc1c4d73b028f5e.tar.gz
Qt-153bf90ea0fc5f58c27c82e13dc1c4d73b028f5e.tar.bz2
HTTP backend: rename method that loads resource from cache
Reviewed-by: Markus Goetz
Diffstat (limited to 'src/network/access')
-rw-r--r--src/network/access/qnetworkaccesshttpbackend.cpp6
-rw-r--r--src/network/access/qnetworkaccesshttpbackend_p.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 84a899e..0438fb5 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -219,7 +219,7 @@ QNetworkAccessHttpBackend::~QNetworkAccessHttpBackend()
2) If we have a cache entry for this url populate headers so the server can return 304
3) Calculate if response_is_fresh and if so send the cache and set loadedFromCache to true
*/
-bool QNetworkAccessHttpBackend::validateCache(QHttpNetworkRequest &httpRequest)
+bool QNetworkAccessHttpBackend::loadFromCacheIfAllowed(QHttpNetworkRequest &httpRequest)
{
QNetworkRequest::CacheLoadControl CacheLoadControlAttribute =
(QNetworkRequest::CacheLoadControl)request().attribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork).toInt();
@@ -440,12 +440,12 @@ void QNetworkAccessHttpBackend::postRequest()
switch (operation()) {
case QNetworkAccessManager::GetOperation:
httpRequest.setOperation(QHttpNetworkRequest::Get);
- loadedFromCache = validateCache(httpRequest);
+ loadedFromCache = loadFromCacheIfAllowed(httpRequest);
break;
case QNetworkAccessManager::HeadOperation:
httpRequest.setOperation(QHttpNetworkRequest::Head);
- loadedFromCache = validateCache(httpRequest);
+ loadedFromCache = loadFromCacheIfAllowed(httpRequest);
break;
case QNetworkAccessManager::PostOperation:
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
index 5e143eb..4778bd0 100644
--- a/src/network/access/qnetworkaccesshttpbackend_p.h
+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
@@ -148,7 +148,7 @@ private:
quint64 resumeOffset;
- bool validateCache(QHttpNetworkRequest &httpRequest);
+ bool loadFromCacheIfAllowed(QHttpNetworkRequest &httpRequest);
void invalidateCache();
void postRequest();
void readFromHttp();