From 76e04fdf3db06f8109be8d7440ca087ec828ec3a Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Fri, 8 Apr 2011 14:47:21 +0200 Subject: [PATCH] cache: rename validateCache() to loadFromCacheIfAllowed() --- src/network/access/qnetworkreplyhttpimpl.cpp | 6 +++--- src/network/access/qnetworkreplyhttpimpl_p.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 5e9d53b7f1..8ecea5cfdf 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -398,7 +398,7 @@ QNetworkReplyHttpImplPrivate::~QNetworkReplyHttpImplPrivate() 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 */ -void QNetworkReplyHttpImplPrivate::validateCache(QHttpNetworkRequest &httpRequest, bool &loadedFromCache) +void QNetworkReplyHttpImplPrivate::loadFromCacheIfAllowed(QHttpNetworkRequest &httpRequest, bool &loadedFromCache) { QNetworkRequest::CacheLoadControl CacheLoadControlAttribute = (QNetworkRequest::CacheLoadControl)request.attribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork).toInt(); @@ -615,12 +615,12 @@ void QNetworkReplyHttpImplPrivate::postRequest() switch (operation) { case QNetworkAccessManager::GetOperation: httpRequest.setOperation(QHttpNetworkRequest::Get); - validateCache(httpRequest, loadedFromCache); + loadFromCacheIfAllowed(httpRequest, loadedFromCache); break; case QNetworkAccessManager::HeadOperation: httpRequest.setOperation(QHttpNetworkRequest::Head); - validateCache(httpRequest, loadedFromCache); + loadFromCacheIfAllowed(httpRequest, loadedFromCache); break; case QNetworkAccessManager::PostOperation: diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index 8711a59f7a..adeaa6a4b2 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -264,7 +264,7 @@ public: #endif - void validateCache(QHttpNetworkRequest &httpRequest, bool &loadedFromCache); + void loadFromCacheIfAllowed(QHttpNetworkRequest &httpRequest, bool &loadedFromCache); void invalidateCache(); bool sendCacheContents(const QNetworkCacheMetaData &metaData); QNetworkCacheMetaData fetchCacheMetaData(const QNetworkCacheMetaData &metaData) const;