From 30644c750d350e860f23292cc57a728064b47145 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 1 Jul 2014 17:46:23 -0700
Subject: [PATCH] Switched AvatarData to NetworkAccessManager

---
 libraries/avatars/src/AvatarData.cpp | 30 ++++++++++++----------------
 libraries/avatars/src/AvatarData.h   |  5 -----
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 94066d9a1c..3f3e71c5e8 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -16,10 +16,10 @@
 #include <QtCore/QDataStream>
 #include <QtCore/QThread>
 #include <QtCore/QUuid>
-#include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
 
+#include <NetworkAccessManager.h>
 #include <NodeList.h>
 #include <PacketHeaders.h>
 #include <SharedUtil.h>
@@ -33,8 +33,6 @@ quint64 DEFAULT_FILTERED_LOG_EXPIRY = 2 * USECS_PER_SECOND;
 
 using namespace std;
 
-QNetworkAccessManager* AvatarData::networkAccessManager = NULL;
-
 AvatarData::AvatarData() :
     _sessionUUID(),
     _handPosition(0,0,0),
@@ -751,18 +749,15 @@ void AvatarData::setBillboard(const QByteArray& billboard) {
 void AvatarData::setBillboardFromURL(const QString &billboardURL) {
     _billboardURL = billboardURL;
     
-    if (AvatarData::networkAccessManager) {
-        qDebug() << "Changing billboard for avatar to PNG at" << qPrintable(billboardURL);
-        
-        QNetworkRequest billboardRequest;
-        billboardRequest.setUrl(QUrl(billboardURL));
-        
-        QNetworkReply* networkReply = AvatarData::networkAccessManager->get(billboardRequest);
-        connect(networkReply, SIGNAL(finished()), this, SLOT(setBillboardFromNetworkReply()));
-        
-    } else {
-        qDebug() << "Billboard PNG download requested but no network access manager is available.";
-    }
+    
+    qDebug() << "Changing billboard for avatar to PNG at" << qPrintable(billboardURL);
+    
+    QNetworkRequest billboardRequest;
+    billboardRequest.setUrl(QUrl(billboardURL));
+    
+    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkReply* networkReply = networkAccessManager.get(billboardRequest);
+    connect(networkReply, SIGNAL(finished()), this, SLOT(setBillboardFromNetworkReply()));
 }
 
 void AvatarData::setBillboardFromNetworkReply() {
@@ -839,8 +834,9 @@ void AvatarData::updateJointMappings() {
     _jointIndices.clear();
     _jointNames.clear();
     
-    if (networkAccessManager && _skeletonModelURL.fileName().toLower().endsWith(".fst")) {
-        QNetworkReply* networkReply = networkAccessManager->get(QNetworkRequest(_skeletonModelURL));
+    if (_skeletonModelURL.fileName().toLower().endsWith(".fst")) {
+        NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+        QNetworkReply* networkReply = networkAccessManager.get(QNetworkRequest(_skeletonModelURL));
         connect(networkReply, SIGNAL(finished()), this, SLOT(setJointMappingsFromNetworkReply()));
     }
 }
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 4c7136fd0a..1b8f6e6007 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -102,7 +102,6 @@ enum KeyState {
 const glm::vec3 vec3Zero(0.0f);
 
 class QDataStream;
-class QNetworkAccessManager;
 
 class AttachmentData;
 class JointData;
@@ -269,8 +268,6 @@ public:
     QElapsedTimer& getLastUpdateTimer() { return _lastUpdateTimer; }
      
     virtual float getBoundingRadius() const { return 1.f; }
-    
-    static void setNetworkAccessManager(QNetworkAccessManager* sharedAccessManager) { networkAccessManager = sharedAccessManager; }
 
 public slots:
     void sendIdentityPacket();
@@ -323,8 +320,6 @@ protected:
     
     QHash<QString, int> _jointIndices; ///< 1-based, since zero is returned for missing keys
     QStringList _jointNames; ///< in order of depth-first traversal
-    
-    static QNetworkAccessManager* networkAccessManager;
 
     quint64 _errorLogExpiry; ///< time in future when to log an error