From 57538af8fd887889d0b30462142ce3fe2b02b6ef Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 19 Feb 2014 14:19:00 -0800
Subject: [PATCH] give a separate QNetworkAccessManager to the AccountManager

---
 interface/src/Application.cpp           | 3 ---
 libraries/shared/src/AccountManager.cpp | 2 +-
 libraries/shared/src/AccountManager.h   | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b89f7e4e55..2d9bb5d3c6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -266,9 +266,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
     QNetworkDiskCache* cache = new QNetworkDiskCache(_networkAccessManager);
     cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");
     _networkAccessManager->setCache(cache);
-    
-    // give our AccountManager access to the single QNetworkAccessManager
-    AccountManager::getInstance().setNetworkAccessManager(_networkAccessManager);
 
     _window->setCentralWidget(_glWidget);
 
diff --git a/libraries/shared/src/AccountManager.cpp b/libraries/shared/src/AccountManager.cpp
index 215fc3a77b..32570a41b9 100644
--- a/libraries/shared/src/AccountManager.cpp
+++ b/libraries/shared/src/AccountManager.cpp
@@ -32,7 +32,7 @@ const QString ACCOUNT_TOKEN_GROUP = "tokens";
 AccountManager::AccountManager() :
     _rootURL(),
     _username(),
-    _networkAccessManager(NULL)
+    _networkAccessManager(new QNetworkAccessManager)
 {
     qRegisterMetaType<OAuthAccessToken>("OAuthAccessToken");
     qRegisterMetaTypeStreamOperators<OAuthAccessToken>("OAuthAccessToken");
diff --git a/libraries/shared/src/AccountManager.h b/libraries/shared/src/AccountManager.h
index 72ec969436..53608d94e2 100644
--- a/libraries/shared/src/AccountManager.h
+++ b/libraries/shared/src/AccountManager.h
@@ -36,7 +36,6 @@ public:
     const QString& getUsername() const { return _username; }
     void setUsername(const QString& username) { _username = username; }
     
-    void setNetworkAccessManager(QNetworkAccessManager* networkAccessManager) { _networkAccessManager = networkAccessManager; }
 public slots:
     void requestFinished();
     void requestError(QNetworkReply::NetworkError error);