History

Fixes to most scripting-related warnings

ksuprynowicz committed 4 years ago

Commit 6f321731 parent a14c64435 files · +195 −149Browse files

Showing the changes to libraries/script-engine/src/AssetScriptingInterface.cpp (1 of 35 files). Show all

Unified · Split

libraries/script-engine/src/AssetScriptingInterface.cpp+7−3
@@ -4,6 +4,7 @@ · 3 unmodified lines
4//4//
5// Created by Stephen Birarda on 2016-03-08.5// Created by Stephen Birarda on 2016-03-08.
6// Copyright 2016 High Fidelity, Inc.6// Copyright 2016 High Fidelity, Inc.
7// Copyright 2022 Overte e.V.
7//8//
8// Distributed under the Apache License, Version 2.0.9// Distributed under the Apache License, Version 2.0.
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html10// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -34,12 +35,15 @@ · 24 unmodified lines
34#include <future>35#include <future>
35 36
36using Promise = MiniPromise::Promise;37using Promise = MiniPromise::Promise;
38STATIC_SCRIPT_TYPES_INITIALIZER((+[](ScriptManager* manager){
39 auto scriptEngine = manager->engine().get();
40
41 scriptRegisterMetaType<std::shared_ptr< MiniPromise >, promiseToScriptValue, promiseFromScriptValue>(scriptEngine);
42}));
43
37 44
38AssetScriptingInterface::AssetScriptingInterface(QObject* parent) : BaseAssetScriptingInterface(parent) {45AssetScriptingInterface::AssetScriptingInterface(QObject* parent) : BaseAssetScriptingInterface(parent) {
39 qCDebug(scriptengine) << "AssetScriptingInterface::AssetScriptingInterface" << parent;46 qCDebug(scriptengine) << "AssetScriptingInterface::AssetScriptingInterface" << parent;
40
41 auto scriptManager = qobject_cast<ScriptManager*>(parent);
42 scriptRegisterMetaType(scriptManager->engine().get(), promiseToScriptValue, promiseFromScriptValue);
43}47}
44 48
45#define JS_VERIFY(cond, error) { if (!this->jsVerify(cond, error)) { return; } }49#define JS_VERIFY(cond, error) { if (!this->jsVerify(cond, error)) { return; } }