From 15b37ec3d1181542fb3c47e4a0efd146ab2cbf79 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 2 Jul 2014 11:21:07 -0700
Subject: [PATCH] Switched ResourceCache to NetworkAccessManager

---
 libraries/{shared => networking}/src/ResourceCache.cpp | 8 ++++----
 libraries/{shared => networking}/src/ResourceCache.h   | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)
 rename libraries/{shared => networking}/src/ResourceCache.cpp (97%)
 rename libraries/{shared => networking}/src/ResourceCache.h (94%)

diff --git a/libraries/shared/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
similarity index 97%
rename from libraries/shared/src/ResourceCache.cpp
rename to libraries/networking/src/ResourceCache.cpp
index 14998232d6..a183e2f9a1 100644
--- a/libraries/shared/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -16,6 +16,8 @@
 #include <QTimer>
 #include <QtDebug>
 
+#include "NetworkAccessManager.h"
+
 #include "ResourceCache.h"
 
 ResourceCache::ResourceCache(QObject* parent) :
@@ -103,8 +105,6 @@ void ResourceCache::requestCompleted(Resource* resource) {
     }
 }
 
-QNetworkAccessManager* ResourceCache::_networkAccessManager = NULL;
-
 const int DEFAULT_REQUEST_LIMIT = 10;
 int ResourceCache::_requestLimit = DEFAULT_REQUEST_LIMIT;
 
@@ -219,7 +219,7 @@ void Resource::init() {
     if (_url.isEmpty()) {
         _startedLoading = _loaded = true;
         
-    } else if (!(_url.isValid() && ResourceCache::getNetworkAccessManager())) {
+    } else if (!(_url.isValid())) {
         _startedLoading = _failedToLoad = true;
     }
 }
@@ -272,7 +272,7 @@ void Resource::handleReplyTimeout() {
 }
 
 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(error(QNetworkReply::NetworkError)), SLOT(handleReplyError()));
diff --git a/libraries/shared/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h
similarity index 94%
rename from libraries/shared/src/ResourceCache.h
rename to libraries/networking/src/ResourceCache.h
index 2404485c46..1593ad45fc 100644
--- a/libraries/shared/src/ResourceCache.h
+++ b/libraries/networking/src/ResourceCache.h
@@ -22,7 +22,6 @@
 #include <QUrl>
 #include <QWeakPointer>
 
-class QNetworkAccessManager;
 class QNetworkReply;
 class QTimer;
 
@@ -33,10 +32,6 @@ class ResourceCache : public QObject {
     Q_OBJECT
     
 public:
-
-    static void setNetworkAccessManager(QNetworkAccessManager* manager) { _networkAccessManager = manager; }
-    static QNetworkAccessManager* getNetworkAccessManager() { return _networkAccessManager; }
-
     static void setRequestLimit(int limit) { _requestLimit = limit; }
     static int getRequestLimit() { return _requestLimit; }
 
@@ -76,7 +71,6 @@ private:
     QHash<QUrl, QWeakPointer<Resource> > _resources;
     int _lastLRUKey;
     
-    static QNetworkAccessManager* _networkAccessManager;
     static int _requestLimit;
     static QList<QPointer<Resource> > _pendingRequests;
     static QList<Resource*> _loadingRequests;