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/ScriptValueUtils.cpp (1 of 35 files). Show all

Unified · Split

libraries/script-engine/src/ScriptValueUtils.cpp+30−29
@@ -4,6 +4,7 @@ · 3 unmodified lines
4//4//
5// Created by Anthony Thibault on 4/15/16.5// Created by Anthony Thibault on 4/15/16.
6// Copyright 2016 High Fidelity, Inc.6// Copyright 2016 High Fidelity, Inc.
7// Copyright 2022 Overte e.V.
7//8//
8// Utilities for working with QtScriptValues9// Utilities for working with QtScriptValues
9//10//
@@ -49,35 +50,35 @@ bool isListOfStrings(const ScriptValue& arg) { · 39 unmodified lines
49}50}
50 51
51void registerMetaTypes(ScriptEngine* engine) {52void registerMetaTypes(ScriptEngine* engine) {
52 scriptRegisterMetaType(engine, vec2ToScriptValue, vec2FromScriptValue);53 scriptRegisterMetaType<glm::vec2, vec2ToScriptValue, vec2FromScriptValue>(engine);
53 scriptRegisterMetaType(engine, vec3ToScriptValue, vec3FromScriptValue);54 scriptRegisterMetaType<glm::vec3, vec3ToScriptValue, vec3FromScriptValue>(engine);
54 scriptRegisterMetaType(engine, u8vec3ToScriptValue, u8vec3FromScriptValue);55 scriptRegisterMetaType<glm::u8vec3, u8vec3ToScriptValue, u8vec3FromScriptValue>(engine);
55 scriptRegisterMetaType(engine, vec4toScriptValue, vec4FromScriptValue);56 scriptRegisterMetaType<glm::vec4, vec4toScriptValue, vec4FromScriptValue>(engine);
56 scriptRegisterMetaType(engine, quatToScriptValue, quatFromScriptValue);57 scriptRegisterMetaType<glm::quat, quatToScriptValue, quatFromScriptValue>(engine);
57 scriptRegisterMetaType(engine, mat4toScriptValue, mat4FromScriptValue);58 scriptRegisterMetaType<glm::mat4, mat4toScriptValue, mat4FromScriptValue>(engine);
58 59
59 scriptRegisterMetaType(engine, qVectorVec3ToScriptValue, qVectorVec3FromScriptValue);60 scriptRegisterMetaType<QVector< glm::vec3 >, qVectorVec3ToScriptValue, qVectorVec3FromScriptValue>(engine);
60 scriptRegisterMetaType(engine, qVectorQuatToScriptValue, qVectorQuatFromScriptValue);61 scriptRegisterMetaType<QVector< glm::quat >, qVectorQuatToScriptValue, qVectorQuatFromScriptValue>(engine);
61 scriptRegisterMetaType(engine, qVectorBoolToScriptValue, qVectorBoolFromScriptValue);62 scriptRegisterMetaType<QVector< bool >, qVectorBoolToScriptValue, qVectorBoolFromScriptValue>(engine);
62 scriptRegisterMetaType(engine, qVectorFloatToScriptValue, qVectorFloatFromScriptValue);63 scriptRegisterMetaType<QVector< float >, qVectorFloatToScriptValue, qVectorFloatFromScriptValue>(engine);
63 scriptRegisterMetaType(engine, qVectorIntToScriptValue, qVectorIntFromScriptValue);64 scriptRegisterMetaType<QVector< uint32_t >, qVectorIntToScriptValue, qVectorIntFromScriptValue>(engine);
64 scriptRegisterMetaType(engine, qVectorQUuidToScriptValue, qVectorQUuidFromScriptValue);65 scriptRegisterMetaType<QVector< QUuid >, qVectorQUuidToScriptValue, qVectorQUuidFromScriptValue>(engine);
65 66
66 scriptRegisterMetaType(engine, qSizeFToScriptValue, qSizeFFromScriptValue);67 scriptRegisterMetaType<QSizeF, qSizeFToScriptValue, qSizeFFromScriptValue>(engine);
67 scriptRegisterMetaType(engine, qRectToScriptValue, qRectFromScriptValue);68 scriptRegisterMetaType<QRect, qRectToScriptValue, qRectFromScriptValue>(engine);
68 scriptRegisterMetaType(engine, qURLToScriptValue, qURLFromScriptValue);69 scriptRegisterMetaType<QUrl, qURLToScriptValue, qURLFromScriptValue>(engine);
69 scriptRegisterMetaType(engine, qColorToScriptValue, qColorFromScriptValue);70 scriptRegisterMetaType<QColor, qColorToScriptValue, qColorFromScriptValue>(engine);
70 71
71 scriptRegisterMetaType(engine, pickRayToScriptValue, pickRayFromScriptValue);72 scriptRegisterMetaType<PickRay, pickRayToScriptValue, pickRayFromScriptValue>(engine);
72 scriptRegisterMetaType(engine, collisionToScriptValue, collisionFromScriptValue);73 scriptRegisterMetaType<Collision, collisionToScriptValue, collisionFromScriptValue>(engine);
73 scriptRegisterMetaType(engine, quuidToScriptValue, quuidFromScriptValue);74 scriptRegisterMetaType<QUuid, quuidToScriptValue, quuidFromScriptValue>(engine);
74 scriptRegisterMetaType(engine, aaCubeToScriptValue, aaCubeFromScriptValue);75 scriptRegisterMetaType<AACube, aaCubeToScriptValue, aaCubeFromScriptValue>(engine);
75 76
76 scriptRegisterMetaType(engine, stencilMaskModeToScriptValue, stencilMaskModeFromScriptValue);77 scriptRegisterMetaType<StencilMaskMode, stencilMaskModeToScriptValue, stencilMaskModeFromScriptValue>(engine);
77 78
78 scriptRegisterMetaType(engine, promiseToScriptValue, promiseFromScriptValue);79 scriptRegisterMetaType<std::shared_ptr< MiniPromise >, promiseToScriptValue, promiseFromScriptValue>(engine);
79 80
80 scriptRegisterSequenceMetaType<QVector<unsigned int>>(engine);81 scriptRegisterSequenceMetaType<QVector<unsigned int> >(engine);
81}82}
82 83
83ScriptValue vec2ToScriptValue(ScriptEngine* engine, const glm::vec2& vec2) {84ScriptValue vec2ToScriptValue(ScriptEngine* engine, const glm::vec2& vec2) {