History

Resolving comments in PR

Gabriel Calero committed 8 years ago

Commit 60507371 parent 6d732dd26 files · +58 −297Browse files

Showing the changes to interface/src/scripting/AssetMappingsScriptingInterface.cpp (1 of 26 files). Show all

Unified · Split

interface/src/scripting/AssetMappingsScriptingInterface.cpp+6−6
@@ -37,7 +37,7 @@ AssetMappingsScriptingInterface::AssetMappingsScriptingInterface() { · 36 unmodified lines
3737 void AssetMappingsScriptingInterface::setMapping(QString path, QString hash, QJSValue callback) {
3838 auto assetClient = DependencyManager::get<AssetClient>();
3939 auto request = assetClient->createSetMappingRequest(path, hash);
40−#ifndef ANDROID
40+#if !defined(Q_OS_ANDROID)
4141 // TODO: just to make android compile
4242 connect(request, &SetMappingRequest::finished, this, [this, callback](SetMappingRequest* request) mutable {
4343 if (callback.isCallable()) {
@@ -55,7 +55,7 @@ void AssetMappingsScriptingInterface::setMapping(QString path, QString hash, QJS · 11 unmodified lines
5555 void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback) {
5656 auto assetClient = DependencyManager::get<AssetClient>();
5757 auto request = assetClient->createGetMappingRequest(path);
58−#ifndef ANDROID
58+#if !defined(Q_OS_ANDROID)
5959 // TODO: just to make android compile
6060 connect(request, &GetMappingRequest::finished, this, [this, callback](GetMappingRequest* request) mutable {
6161 auto hash = request->getHash();
@@ -144,7 +144,7 @@ void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping, · 82 unmodified lines
144144 void AssetMappingsScriptingInterface::deleteMappings(QStringList paths, QJSValue callback) {
145145 auto assetClient = DependencyManager::get<AssetClient>();
146146 auto request = assetClient->createDeleteMappingsRequest(paths);
147−#ifndef ANDROID
147+#if !defined(Q_OS_ANDROID)
148148 // TODO: just to make android compile
149149 connect(request, &DeleteMappingsRequest::finished, this, [this, callback](DeleteMappingsRequest* request) mutable {
150150 if (callback.isCallable()) {
@@ -162,7 +162,7 @@ void AssetMappingsScriptingInterface::deleteMappings(QStringList paths, QJSValue · 11 unmodified lines
162162 void AssetMappingsScriptingInterface::getAllMappings(QJSValue callback) {
163163 auto assetClient = DependencyManager::get<AssetClient>();
164164 auto request = assetClient->createGetAllMappingsRequest();
165−#ifndef ANDROID
165+#if !defined(Q_OS_ANDROID)
166166 // TODO: just to make android compile
167167 connect(request, &GetAllMappingsRequest::finished, this, [this, callback](GetAllMappingsRequest* request) mutable {
168168 auto mappings = request->getMappings();
@@ -187,7 +187,7 @@ void AssetMappingsScriptingInterface::getAllMappings(QJSValue callback) { · 18 unmodified lines
187187 void AssetMappingsScriptingInterface::renameMapping(QString oldPath, QString newPath, QJSValue callback) {
188188 auto assetClient = DependencyManager::get<AssetClient>();
189189 auto request = assetClient->createRenameMappingRequest(oldPath, newPath);
190−#ifndef ANDROID
190+#if !defined(Q_OS_ANDROID)
191191 // TODO: just to make android compile
192192 connect(request, &RenameMappingRequest::finished, this, [this, callback](RenameMappingRequest* request) mutable {
193193 if (callback.isCallable()) {
@@ -204,7 +204,7 @@ void AssetMappingsScriptingInterface::renameMapping(QString oldPath, QString new · 10 unmodified lines
204204 void AssetMappingsScriptingInterface::setBakingEnabled(QStringList paths, bool enabled, QJSValue callback) {
205205 auto assetClient = DependencyManager::get<AssetClient>();
206206 auto request = assetClient->createSetBakingEnabledRequest(paths, enabled);
207−#ifndef ANDROID
207+#if !defined(Q_OS_ANDROID)
208208 // TODO: just to make android compile
209209 connect(request, &SetBakingEnabledRequest::finished, this, [this, callback](SetBakingEnabledRequest* request) mutable {
210210 if (callback.isCallable()) {