Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Switch ModelsBrowser to NetworkAccessManager

Browse source
This commit is contained in:
Atlante45 2014-07-02 10:53:30 -07:00
parent f6221abb71
commit da0021cc8e
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/ui/ModelsBrowser.cpp
View file

@ -14,10 +14,11 @@
#include <QGridLayout> #include <QGridLayout>
#include <QHeaderView> #include <QHeaderView>
#include <QMessageBox> #include <QMessageBox>
#include <QNetworkAccessManager>
#include <QUrl> #include <QUrl>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <NetworkAccessManager.h>
#include "Application.h" #include "Application.h"
#include "ModelsBrowser.h" #include "ModelsBrowser.h"
@ -210,10 +211,10 @@ void ModelHandler::update() {
} }
for (int i = 0; i < _model.rowCount(); ++i) { for (int i = 0; i < _model.rowCount(); ++i) {
QUrl url(_model.item(i,0)->data(Qt::UserRole).toString()); QUrl url(_model.item(i,0)->data(Qt::UserRole).toString());
QNetworkAccessManager* accessManager = new QNetworkAccessManager(this); NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest request(url); QNetworkRequest request(url);
accessManager->head(request); QNetworkReply* reply = networkAccessManager.head(request);
connect(accessManager, SIGNAL(finished(QNetworkReply*)), SLOT(downloadFinished(QNetworkReply*))); connect(reply, SIGNAL(finished()), SLOT(processCheck()));
} }
_lock.unlock(); _lock.unlock();
} }
@ -233,7 +234,8 @@ void ModelHandler::exit() {
_lock.unlock(); _lock.unlock();
} }
void ModelHandler::downloadFinished(QNetworkReply* reply) { void ModelHandler::downloadFinished() {
QNetworkReply* reply = static_cast<QNetworkReply*>(sender());
QByteArray data = reply->readAll(); QByteArray data = reply->readAll();
if (!data.isEmpty()) { if (!data.isEmpty()) {
@ -261,10 +263,10 @@ void ModelHandler::queryNewFiles(QString marker) {
// Download // Download
url.setQuery(query); url.setQuery(query);
QNetworkAccessManager* accessManager = new QNetworkAccessManager(this); NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest request(url); QNetworkRequest request(url);
accessManager->get(request); QNetworkReply* reply = networkAccessManager.get(request);
connect(accessManager, SIGNAL(finished(QNetworkReply*)), SLOT(downloadFinished(QNetworkReply*))); connect(reply, SIGNAL(finished()), SLOT(processCheck()));
} }

2
interface/src/ui/ModelsBrowser.h
View file

@ -43,7 +43,7 @@ public slots:
void exit(); void exit();
private slots: private slots:
void downloadFinished(QNetworkReply* reply); void downloadFinished();
private: private:
bool _initiateExit; bool _initiateExit;