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