From da0021cc8e566a0fe71a567a845e1ed799694e7f Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 2 Jul 2014 10:53:30 -0700
Subject: [PATCH] Switch ModelsBrowser to NetworkAccessManager

---
 interface/src/ui/ModelsBrowser.cpp | 18 ++++++++++--------
 interface/src/ui/ModelsBrowser.h   |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/interface/src/ui/ModelsBrowser.cpp b/interface/src/ui/ModelsBrowser.cpp
index 203c54d97a..ec583a14f7 100644
--- a/interface/src/ui/ModelsBrowser.cpp
+++ b/interface/src/ui/ModelsBrowser.cpp
@@ -14,10 +14,11 @@
 #include <QGridLayout>
 #include <QHeaderView>
 #include <QMessageBox>
-#include <QNetworkAccessManager>
 #include <QUrl>
 #include <QXmlStreamReader>
 
+#include <NetworkAccessManager.h>
+
 #include "Application.h"
 
 #include "ModelsBrowser.h"
@@ -210,10 +211,10 @@ void ModelHandler::update() {
     }
     for (int i = 0; i < _model.rowCount(); ++i) {
         QUrl url(_model.item(i,0)->data(Qt::UserRole).toString());
-        QNetworkAccessManager* accessManager = new QNetworkAccessManager(this);
+        NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
         QNetworkRequest request(url);
-        accessManager->head(request);
-        connect(accessManager, SIGNAL(finished(QNetworkReply*)), SLOT(downloadFinished(QNetworkReply*)));
+        QNetworkReply* reply = networkAccessManager.head(request);
+        connect(reply, SIGNAL(finished()), SLOT(processCheck()));
     }
     _lock.unlock();
 }
@@ -233,7 +234,8 @@ void ModelHandler::exit() {
     _lock.unlock();
 }
 
-void ModelHandler::downloadFinished(QNetworkReply* reply) {
+void ModelHandler::downloadFinished() {
+    QNetworkReply* reply = static_cast<QNetworkReply*>(sender());
     QByteArray data = reply->readAll();
     
     if (!data.isEmpty()) {
@@ -261,10 +263,10 @@ void ModelHandler::queryNewFiles(QString marker) {
     
     // Download
     url.setQuery(query);
-    QNetworkAccessManager* accessManager = new QNetworkAccessManager(this);
+    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
     QNetworkRequest request(url);
-    accessManager->get(request);
-    connect(accessManager, SIGNAL(finished(QNetworkReply*)), SLOT(downloadFinished(QNetworkReply*)));
+    QNetworkReply* reply = networkAccessManager.get(request);
+    connect(reply, SIGNAL(finished()), SLOT(processCheck()));
             
 }
 
diff --git a/interface/src/ui/ModelsBrowser.h b/interface/src/ui/ModelsBrowser.h
index 3e832c9dbe..8063fd8eeb 100644
--- a/interface/src/ui/ModelsBrowser.h
+++ b/interface/src/ui/ModelsBrowser.h
@@ -43,7 +43,7 @@ public slots:
     void exit();
     
 private slots:
-    void downloadFinished(QNetworkReply* reply);
+    void downloadFinished();
     
 private:
     bool _initiateExit;