Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Switched ResourceCache to NetworkAccessManager

Browse source
This commit is contained in:
Atlante45 2014-07-02 11:21:07 -07:00
parent da0021cc8e
commit 15b37ec3d1
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/shared/src/ResourceCache.cpp → libraries/networking/src/ResourceCache.cpp
View file

@ -16,6 +16,8 @@
#include <QTimer> #include <QTimer>
#include <QtDebug> #include <QtDebug>
#include "NetworkAccessManager.h"
#include "ResourceCache.h" #include "ResourceCache.h"
ResourceCache::ResourceCache(QObject* parent) : ResourceCache::ResourceCache(QObject* parent) :
@ -103,8 +105,6 @@ void ResourceCache::requestCompleted(Resource* resource) {
} }
} }
QNetworkAccessManager* ResourceCache::_networkAccessManager = NULL;
const int DEFAULT_REQUEST_LIMIT = 10; const int DEFAULT_REQUEST_LIMIT = 10;
int ResourceCache::_requestLimit = DEFAULT_REQUEST_LIMIT; int ResourceCache::_requestLimit = DEFAULT_REQUEST_LIMIT;
@ -219,7 +219,7 @@ void Resource::init() {
if (_url.isEmpty()) { if (_url.isEmpty()) {
_startedLoading = _loaded = true; _startedLoading = _loaded = true;
} else if (!(_url.isValid() && ResourceCache::getNetworkAccessManager())) { } else if (!(_url.isValid())) {
_startedLoading = _failedToLoad = true; _startedLoading = _failedToLoad = true;
} }
} }
@ -272,7 +272,7 @@ void Resource::handleReplyTimeout() {
} }
void Resource::makeRequest() { void Resource::makeRequest() {
_reply = ResourceCache::getNetworkAccessManager()->get(_request); _reply = NetworkAccessManager::getInstance().get(_request);
connect(_reply, SIGNAL(downloadProgress(qint64,qint64)), SLOT(handleDownloadProgress(qint64,qint64))); connect(_reply, SIGNAL(downloadProgress(qint64,qint64)), SLOT(handleDownloadProgress(qint64,qint64)));
connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(handleReplyError())); connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(handleReplyError()));

6
libraries/shared/src/ResourceCache.h → libraries/networking/src/ResourceCache.h
View file

@ -22,7 +22,6 @@
#include <QUrl> #include <QUrl>
#include <QWeakPointer> #include <QWeakPointer>
class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class QTimer; class QTimer;
@ -33,10 +32,6 @@ class ResourceCache : public QObject {
Q_OBJECT Q_OBJECT
public: public:
static void setNetworkAccessManager(QNetworkAccessManager* manager) { _networkAccessManager = manager; }
static QNetworkAccessManager* getNetworkAccessManager() { return _networkAccessManager; }
static void setRequestLimit(int limit) { _requestLimit = limit; } static void setRequestLimit(int limit) { _requestLimit = limit; }
static int getRequestLimit() { return _requestLimit; } static int getRequestLimit() { return _requestLimit; }
@ -76,7 +71,6 @@ private:
QHash<QUrl, QWeakPointer<Resource> > _resources; QHash<QUrl, QWeakPointer<Resource> > _resources;
int _lastLRUKey; int _lastLRUKey;
static QNetworkAccessManager* _networkAccessManager;
static int _requestLimit; static int _requestLimit;
static QList<QPointer<Resource> > _pendingRequests; static QList<QPointer<Resource> > _pendingRequests;
static QList<Resource*> _loadingRequests; static QList<Resource*> _loadingRequests;