History

Switched ScriptEngine to NetworkAccessManager

Atlante45 committed 12 years ago

Commit 2549b0d1 parent 14a2bbb1 file · +5 −5Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−5
@@ -13,7 +13,6 @@ · 12 unmodified lines
13#include <QtCore/QEventLoop>13#include <QtCore/QEventLoop>
14#include <QtCore/QTimer>14#include <QtCore/QTimer>
15#include <QtCore/QThread>15#include <QtCore/QThread>
16#include <QtNetwork/QNetworkAccessManager>
17#include <QtNetwork/QNetworkRequest>16#include <QtNetwork/QNetworkRequest>
18#include <QtNetwork/QNetworkReply>17#include <QtNetwork/QNetworkReply>
19#include <QScriptEngine>18#include <QScriptEngine>
@@ -23,6 +22,7 @@ · 3 unmodified lines
23#include <AvatarData.h>22#include <AvatarData.h>
24#include <CollisionInfo.h>23#include <CollisionInfo.h>
25#include <ModelsScriptingInterface.h>24#include <ModelsScriptingInterface.h>
25#include <NetworkAccessManager.h>
26#include <NodeList.h>26#include <NodeList.h>
27#include <PacketHeaders.h>27#include <PacketHeaders.h>
28#include <ParticlesScriptingInterface.h>28#include <ParticlesScriptingInterface.h>
@@ -141,8 +141,8 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 112 unmodified lines
141 emit errorMessage("ERROR Loading file:" + fileName);141 emit errorMessage("ERROR Loading file:" + fileName);
142 }142 }
143 } else {143 } else {
144 QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);144 NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
145 QNetworkReply* reply = networkManager->get(QNetworkRequest(url));145 QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
146 qDebug() << "Downloading included script at" << url;146 qDebug() << "Downloading included script at" << url;
147 QEventLoop loop;147 QEventLoop loop;
148 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));148 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
@@ -646,8 +646,8 @@ void ScriptEngine::include(const QString& includeFile) { · 497 unmodified lines
646 QString includeContents;646 QString includeContents;
647 647
648 if (url.scheme() == "http" || url.scheme() == "ftp") {648 if (url.scheme() == "http" || url.scheme() == "ftp") {
649 QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);649 NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
650 QNetworkReply* reply = networkManager->get(QNetworkRequest(url));650 QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
651 qDebug() << "Downloading included script at" << includeFile;651 qDebug() << "Downloading included script at" << includeFile;
652 QEventLoop loop;652 QEventLoop loop;
653 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));653 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));