History

Merge branch 'master' of https://github.com/highfidelity/hifi

Stephen Birarda committed 12 years ago

Commit f1e2ba12 parents 73312ec 67910a566 files · +1561 −308Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 66 files). 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>
@@ -142,8 +142,8 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 113 unmodified lines
142 emit errorMessage("ERROR Loading file:" + fileName);142 emit errorMessage("ERROR Loading file:" + fileName);
143 }143 }
144 } else {144 } else {
145 QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);145 NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
146 QNetworkReply* reply = networkManager->get(QNetworkRequest(url));146 QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
147 qDebug() << "Downloading included script at" << url;147 qDebug() << "Downloading included script at" << url;
148 QEventLoop loop;148 QEventLoop loop;
149 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));149 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
@@ -648,8 +648,8 @@ void ScriptEngine::include(const QString& includeFile) { · 498 unmodified lines
648 QString includeContents;648 QString includeContents;
649 649
650 if (url.scheme() == "http" || url.scheme() == "ftp") {650 if (url.scheme() == "http" || url.scheme() == "ftp") {
651 QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);651 NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
652 QNetworkReply* reply = networkManager->get(QNetworkRequest(url));652 QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
653 qDebug() << "Downloading included script at" << includeFile;653 qDebug() << "Downloading included script at" << includeFile;
654 QEventLoop loop;654 QEventLoop loop;
655 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));655 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));