Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:36:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove nullptr request checks in AssetMappingsScriptingInterface

Browse source
This commit is contained in:
Stephen Birarda 2016-03-10 10:24:11 -08:00
parent 99718e9c4e
commit fccad7dca4
1 changed files with 37 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/script-engine/src/AssetMappingsScriptingInterface.cpp
View file

@ -51,7 +51,6 @@ void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback
auto assetClient = DependencyManager::get<AssetClient>();
auto request = assetClient->createGetMappingRequest(path);
if (request) {
connect(request, &GetMappingRequest::finished, this, [this, callback](GetMappingRequest* request) mutable {
QJSValueList args { uint8_t(request->getError()), request->getHash() };
@ -62,18 +61,12 @@ void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback
});
request->start();
} else {
// not connected to an Asset Server, return network error
QJSValueList args { uint8_t(MappingRequest::NetworkError) };
callback.call(args);
}
}
void AssetMappingsScriptingInterface::deleteMappings(QStringList paths, QJSValue callback) {
auto assetClient = DependencyManager::get<AssetClient>();
auto request = assetClient->createDeleteMappingsRequest(paths);
if (request) {
connect(request, &DeleteMappingsRequest::finished, this, [this, callback](DeleteMappingsRequest* request) mutable {
QJSValueList args { uint8_t(request->getError()) };
@ -84,18 +77,12 @@ void AssetMappingsScriptingInterface::deleteMappings(QStringList paths, QJSValue
});
request->start();
} else {
// not connected to an Asset Server, return network error
QJSValueList args { uint8_t(MappingRequest::NetworkError) };
callback.call(args);
}
}
void AssetMappingsScriptingInterface::getAllMappings(QJSValue callback) {
auto assetClient = DependencyManager::get<AssetClient>();
auto request = assetClient->createGetAllMappingsRequest();
if (request) {
connect(request, &GetAllMappingsRequest::finished, this, [this, callback](GetAllMappingsRequest* request) mutable {
auto mappings = request->getMappings();
auto map = callback.engine()->newObject();
@ -113,18 +100,12 @@ void AssetMappingsScriptingInterface::getAllMappings(QJSValue callback) {
});
request->start();
} else {
// not connected to an Asset Server, return network error
QJSValueList args { uint8_t(MappingRequest::NetworkError) };
callback.call(args);
}
}
void AssetMappingsScriptingInterface::renameMapping(QString oldPath, QString newPath, QJSValue callback) {
auto assetClient = DependencyManager::get<AssetClient>();
auto request = assetClient->createRenameMappingRequest(oldPath, newPath);
if (request) {
connect(request, &RenameMappingRequest::finished, this, [this, callback](RenameMappingRequest* request) mutable {
QJSValueList args { uint8_t(request->getError()) };
@ -135,11 +116,6 @@ void AssetMappingsScriptingInterface::renameMapping(QString oldPath, QString new
});
request->start();
} else {
// not connected to an Asset Server, return network error
QJSValueList args { uint8_t(MappingRequest::NetworkError) };
callback.call(args);
}
}