Showing the changes to interface/src/ScriptsModel.cpp (1 of 2 files). Show all
Unified · Split
| @@ -11,14 +11,15 @@ · 10 unmodified lines | ||
| 11 | 11 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html |
| 12 | 12 | // |
| 13 | 13 | |
| 14 | −#include <QNetworkAccessManager> | |
| 15 | 14 | #include <QUrl> |
| 16 | 15 | #include <QUrlQuery> |
| 17 | 16 | #include <QXmlStreamReader> |
| 18 | 17 | |
| 19 | −#include "ScriptsModel.h" | |
| 18 | +#include <NetworkAccessManager.h> | |
| 19 | + | |
| 20 | 20 | #include "Menu.h" |
| 21 | 21 | |
| 22 | +#include "ScriptsModel.h" | |
| 22 | 23 | |
| 23 | 24 | static const QString S3_URL = "http://highfidelity-public.s3-us-west-1.amazonaws.com"; |
| 24 | 25 | static const QString PUBLIC_URL = "http://public.highfidelity.io"; |
| @@ -113,14 +114,15 @@ void ScriptsModel::requestRemoteFiles(QString marker) { · 88 unmodified lines | ||
| 113 | 114 | } |
| 114 | 115 | url.setQuery(query); |
| 115 | 116 | |
| 116 | − QNetworkAccessManager* accessManager = new QNetworkAccessManager(this); | |
| 117 | − connect(accessManager, SIGNAL(finished(QNetworkReply*)), SLOT(downloadFinished(QNetworkReply*))); | |
| 118 | − | |
| 117 | + NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); | |
| 119 | 118 | QNetworkRequest request(url); |
| 120 | − accessManager->get(request); | |
| 119 | + QNetworkReply* reply = networkAccessManager.get(request); | |
| 120 | + connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); | |
| 121 | + | |
| 121 | 122 | } |
| 122 | 123 | |
| 123 | −void ScriptsModel::downloadFinished(QNetworkReply* reply) { | |
| 124 | +void ScriptsModel::downloadFinished() { | |
| 125 | + QNetworkReply* reply = static_cast<QNetworkReply*>(sender()); | |
| 124 | 126 | bool finished = true; |
| 125 | 127 | |
| 126 | 128 | if (reply->error() == QNetworkReply::NoError) { |