Showing the changes to libraries/script-engine/src/AssetScriptingInterface.cpp (1 of 6 files). Show all
Unified · Split
| @@ -50,7 +50,7 @@ void AssetScriptingInterface::uploadData(QString data, QScriptValue callback) { · 49 unmodified lines | |||
| 50 | jsCallback(handler, url, hash); | 50 | jsCallback(handler, url, hash); |
| 51 | }); | 51 | }); |
| 52 | 52 | ||
| 53 | connect(upload, &AssetUpload::finished, upload, [this, deferred](AssetUpload* upload, const QString& hash) { | 53 | connect(upload, &AssetUpload::finished, upload, [deferred](AssetUpload* upload, const QString& hash) { |
| 54 | // we are now on the "Resource Manager" thread (and "hash" being a *reference* makes it unsafe to use directly) | 54 | // we are now on the "Resource Manager" thread (and "hash" being a *reference* makes it unsafe to use directly) |
| 55 | Q_ASSERT(QThread::currentThread() == upload->thread()); | 55 | Q_ASSERT(QThread::currentThread() == upload->thread()); |
| 56 | deferred->resolve({ | 56 | deferred->resolve({ |
| @@ -70,7 +70,7 @@ void AssetScriptingInterface::setMapping(QString path, QString hash, QScriptValu · 13 unmodified lines | |||
| 70 | jsCallback(handler, error, result); | 70 | jsCallback(handler, error, result); |
| 71 | }); | 71 | }); |
| 72 | 72 | ||
| 73 | connect(setMappingRequest, &SetMappingRequest::finished, setMappingRequest, [this, deferred](SetMappingRequest* request) { | 73 | connect(setMappingRequest, &SetMappingRequest::finished, setMappingRequest, [deferred](SetMappingRequest* request) { |
| 74 | Q_ASSERT(QThread::currentThread() == request->thread()); | 74 | Q_ASSERT(QThread::currentThread() == request->thread()); |
| 75 | // we are now on the "Resource Manager" thread | 75 | // we are now on the "Resource Manager" thread |
| 76 | QString error = request->getErrorString(); | 76 | QString error = request->getErrorString(); |
| @@ -102,7 +102,7 @@ void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callb · 25 unmodified lines | |||
| 102 | jsCallback(handler, result.value("data").toString(), { { "errorMessage", error } }); | 102 | jsCallback(handler, result.value("data").toString(), { { "errorMessage", error } }); |
| 103 | }); | 103 | }); |
| 104 | 104 | ||
| 105 | connect(assetRequest, &AssetRequest::finished, assetRequest, [this, deferred](AssetRequest* request) { | 105 | connect(assetRequest, &AssetRequest::finished, assetRequest, [deferred](AssetRequest* request) { |
| 106 | Q_ASSERT(QThread::currentThread() == request->thread()); | 106 | Q_ASSERT(QThread::currentThread() == request->thread()); |
| 107 | // we are now on the "Resource Manager" thread | 107 | // we are now on the "Resource Manager" thread |
| 108 | Q_ASSERT(request->getState() == AssetRequest::Finished); | 108 | Q_ASSERT(request->getState() == AssetRequest::Finished); |
| @@ -128,7 +128,7 @@ void AssetScriptingInterface::setBakingEnabled(QString path, bool enabled, QScri · 19 unmodified lines | |||
| 128 | 128 | ||
| 129 | Promise deferred = jsPromiseReady(makePromise(__FUNCTION__), thisObject(), callback); | 129 | Promise deferred = jsPromiseReady(makePromise(__FUNCTION__), thisObject(), callback); |
| 130 | 130 | ||
| 131 | connect(setBakingEnabledRequest, &SetBakingEnabledRequest::finished, setBakingEnabledRequest, [this, deferred](SetBakingEnabledRequest* request) { | 131 | connect(setBakingEnabledRequest, &SetBakingEnabledRequest::finished, setBakingEnabledRequest, [deferred](SetBakingEnabledRequest* request) { |
| 132 | Q_ASSERT(QThread::currentThread() == request->thread()); | 132 | Q_ASSERT(QThread::currentThread() == request->thread()); |
| 133 | // we are now on the "Resource Manager" thread | 133 | // we are now on the "Resource Manager" thread |
| 134 | 134 | ||