Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 09:25:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings

Browse source
This commit is contained in:
Brad Davis 2018-02-23 13:29:03 -08:00
parent 12d1885dff
commit 3e552e5739
6 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/scripting/AssetMappingsScriptingInterface.cpp
View file

@ -140,7 +140,7 @@ void AssetMappingsScriptingInterface::deleteMappings(QStringList paths, QJSValue
auto assetClient = DependencyManager::get<AssetClient>();
auto request = assetClient->createDeleteMappingsRequest(paths);
connect(request, &DeleteMappingsRequest::finished, this, [this, callback](DeleteMappingsRequest* request) mutable {
connect(request, &DeleteMappingsRequest::finished, this, [callback](DeleteMappingsRequest* request) mutable {
if (callback.isCallable()) {
QJSValueList args { request->getErrorString() };
callback.call(args);
@ -156,7 +156,7 @@ void AssetMappingsScriptingInterface::getAllMappings(QJSValue callback) {
auto assetClient = DependencyManager::get<AssetClient>();
auto request = assetClient->createGetAllMappingsRequest();
connect(request, &GetAllMappingsRequest::finished, this, [this, callback](GetAllMappingsRequest* request) mutable {
connect(request, &GetAllMappingsRequest::finished, this, [callback](GetAllMappingsRequest* request) mutable {
auto mappings = request->getMappings();
auto map = callback.engine()->newObject();
@ -179,7 +179,7 @@ void AssetMappingsScriptingInterface::renameMapping(QString oldPath, QString new
auto assetClient = DependencyManager::get<AssetClient>();
auto request = assetClient->createRenameMappingRequest(oldPath, newPath);
connect(request, &RenameMappingRequest::finished, this, [this, callback](RenameMappingRequest* request) mutable {
connect(request, &RenameMappingRequest::finished, this, [callback](RenameMappingRequest* request) mutable {
if (callback.isCallable()) {
QJSValueList args{ request->getErrorString() };
callback.call(args);
@ -195,7 +195,7 @@ void AssetMappingsScriptingInterface::setBakingEnabled(QStringList paths, bool e
auto assetClient = DependencyManager::get<AssetClient>();
auto request = assetClient->createSetBakingEnabledRequest(paths, enabled);
connect(request, &SetBakingEnabledRequest::finished, this, [this, callback](SetBakingEnabledRequest* request) mutable {
connect(request, &SetBakingEnabledRequest::finished, this, [callback](SetBakingEnabledRequest* request) mutable {
if (callback.isCallable()) {
QJSValueList args{ request->getErrorString() };
callback.call(args);

2
libraries/networking/src/BaseAssetScriptingInterface.cpp
View file

@ -233,7 +233,7 @@ Promise BaseAssetScriptingInterface::downloadBytes(QString hash) {
QPointer<AssetRequest> assetRequest = assetClient()->createRequest(hash);
Promise deferred = makePromise(__FUNCTION__);
QObject::connect(assetRequest, &AssetRequest::finished, assetRequest, [this, deferred](AssetRequest* request) {
QObject::connect(assetRequest, &AssetRequest::finished, assetRequest, [deferred](AssetRequest* request) {
// note: we are now on the "Resource Manager" thread
Q_ASSERT(QThread::currentThread() == request->thread());
Q_ASSERT(request->getState() == AssetRequest::Finished);

1
libraries/render-utils/src/AnimDebugDraw.cpp
View file

@ -9,7 +9,6 @@
#include "AnimDebugDraw.h"
#include <gpu/Shader.h>
#include <gpu/Batch.h>
#include <GLMHelpers.h>

8
libraries/script-engine/src/AssetScriptingInterface.cpp
View file

@ -50,7 +50,7 @@ void AssetScriptingInterface::uploadData(QString data, QScriptValue callback) {
jsCallback(handler, url, hash);
});
connect(upload, &AssetUpload::finished, upload, [this, deferred](AssetUpload* upload, const QString& hash) {
connect(upload, &AssetUpload::finished, upload, [deferred](AssetUpload* upload, const QString& hash) {
// we are now on the "Resource Manager" thread (and "hash" being a *reference* makes it unsafe to use directly)
Q_ASSERT(QThread::currentThread() == upload->thread());
deferred->resolve({
@ -70,7 +70,7 @@ void AssetScriptingInterface::setMapping(QString path, QString hash, QScriptValu
jsCallback(handler, error, result);
});
connect(setMappingRequest, &SetMappingRequest::finished, setMappingRequest, [this, deferred](SetMappingRequest* request) {
connect(setMappingRequest, &SetMappingRequest::finished, setMappingRequest, [deferred](SetMappingRequest* request) {
Q_ASSERT(QThread::currentThread() == request->thread());
// we are now on the "Resource Manager" thread
QString error = request->getErrorString();
@ -102,7 +102,7 @@ void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callb
jsCallback(handler, result.value("data").toString(), { { "errorMessage", error } });
});
connect(assetRequest, &AssetRequest::finished, assetRequest, [this, deferred](AssetRequest* request) {
connect(assetRequest, &AssetRequest::finished, assetRequest, [deferred](AssetRequest* request) {
Q_ASSERT(QThread::currentThread() == request->thread());
// we are now on the "Resource Manager" thread
Q_ASSERT(request->getState() == AssetRequest::Finished);
@ -128,7 +128,7 @@ void AssetScriptingInterface::setBakingEnabled(QString path, bool enabled, QScri
Promise deferred = jsPromiseReady(makePromise(__FUNCTION__), thisObject(), callback);
connect(setBakingEnabledRequest, &SetBakingEnabledRequest::finished, setBakingEnabledRequest, [this, deferred](SetBakingEnabledRequest* request) {
connect(setBakingEnabledRequest, &SetBakingEnabledRequest::finished, setBakingEnabledRequest, [deferred](SetBakingEnabledRequest* request) {
Q_ASSERT(QThread::currentThread() == request->thread());
// we are now on the "Resource Manager" thread

4
libraries/shared/src/shared/MiniPromises.h
View file

@ -103,7 +103,7 @@ public:
return self();
}
Promise fail(ErrorFunction errorOnly) {
return fail([this, errorOnly](QString error, QVariantMap result) {
return fail([errorOnly](QString error, QVariantMap result) {
errorOnly(error);
});
}
@ -122,7 +122,7 @@ public:
}
Promise then(SuccessFunction successOnly) {
return then([this, successOnly](QString error, QVariantMap result) {
return then([successOnly](QString error, QVariantMap result) {
successOnly(result);
});
}

7
tools/ktx-tool/src/main.cpp
View file

@ -70,13 +70,6 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
std::cout << message.toStdString() << std::endl;
}
static inline glm::uvec2 evalMipDimension(uint32_t mipLevel, const glm::uvec2& dims) {
return glm::uvec2{
std::max(dims.x >> mipLevel, 1U),
std::max(dims.y >> mipLevel, 1U),
};
}
void processKtxFile(const QFileInfo& inputFileInfo) {
const QString inputFileName = inputFileInfo.absoluteFilePath();
const QString compressedFileName = DEST_FOLDER.absoluteFilePath(inputFileInfo.fileName());