From 98fc1836d8980a78d259236d1c9d5485fb5f3556 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 27 Jan 2015 18:09:22 -0800
Subject: [PATCH] Revert "Use QDickCache for every QNAM"

This reverts commit 2f39b93823a004ce123f495e9f3317bbeb573c68.
---
 assignment-client/src/Agent.cpp                   |  6 ++++++
 interface/src/Application.cpp                     |  9 +++++++++
 libraries/networking/src/NetworkAccessManager.cpp | 14 +-------------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 8e700839c1..eab67818c4 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -13,6 +13,7 @@
 #include <QtCore/QEventLoop>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QTimer>
+#include <QtNetwork/QNetworkDiskCache>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
 
@@ -170,6 +171,11 @@ void Agent::run() {
     QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
     QNetworkReply *reply = networkAccessManager.get(QNetworkRequest(scriptURL));
     
+    QNetworkDiskCache* cache = new QNetworkDiskCache();
+    QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+    cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "agentCache");
+    networkAccessManager.setCache(cache);
+    
     qDebug() << "Downloading script at" << scriptURL.toString();
     
     QEventLoop loop;
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index e5a68d9f8e..5a60be39a1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -33,6 +33,7 @@
 #include <QMenuBar>
 #include <QMouseEvent>
 #include <QNetworkReply>
+#include <QNetworkDiskCache>
 #include <QOpenGLFramebufferObject>
 #include <QObject>
 #include <QWheelEvent>
@@ -135,6 +136,9 @@ static unsigned STARFIELD_SEED = 1;
 
 static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored
 
+
+const qint64 MAXIMUM_CACHE_SIZE = 10737418240;  // 10GB
+
 static QTimer* idleTimer = NULL;
 
 const QString CHECK_VERSION_URL = "https://highfidelity.io/latestVersion.xml";
@@ -383,7 +387,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     connect(billboardPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendBillboardPacket);
     billboardPacketTimer->start(AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS);
 
+    QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
     QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkDiskCache* cache = new QNetworkDiskCache();
+    cache->setMaximumCacheSize(MAXIMUM_CACHE_SIZE);
+    cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");
+    networkAccessManager.setCache(cache);
 
     ResourceCache::setRequestLimit(3);
 
diff --git a/libraries/networking/src/NetworkAccessManager.cpp b/libraries/networking/src/NetworkAccessManager.cpp
index 0db8058535..841b7491c7 100644
--- a/libraries/networking/src/NetworkAccessManager.cpp
+++ b/libraries/networking/src/NetworkAccessManager.cpp
@@ -9,27 +9,15 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QNetworkDiskCache>
-#include <QStandardPaths>
 #include <QThreadStorage>
 
 #include "NetworkAccessManager.h"
 
-const qint64 MAXIMUM_CACHE_SIZE = 10737418240;  // 10GB
-
 QThreadStorage<QNetworkAccessManager*> networkAccessManagers;
 
 QNetworkAccessManager& NetworkAccessManager::getInstance() {
     if (!networkAccessManagers.hasLocalData()) {
-        QNetworkAccessManager* networkAccessManager = new QNetworkAccessManager();
-        
-        QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
-        QNetworkDiskCache* cache = new QNetworkDiskCache();
-        cache->setMaximumCacheSize(MAXIMUM_CACHE_SIZE);
-        cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");
-        networkAccessManager->setCache(cache);
-        
-        networkAccessManagers.setLocalData(networkAccessManager);
+        networkAccessManagers.setLocalData(new QNetworkAccessManager());
     }
     
     return *networkAccessManagers.localData();