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

Unified · Split

libraries/script-engine/src/qtscript/ScriptEngineQtScript_cast.cpp+7−7
@@ -186,13 +186,13 @@ static bool JsonArrayFromScriptValue(const ScriptValue& src, QJsonArray& dest) { · 185 unmodified lines
186186 void ScriptEngineQtScript::registerSystemTypes() {
187187 qScriptRegisterMetaType(this, ScriptValueToQScriptValue, ScriptValueFromQScriptValue);
188188
189− scriptRegisterMetaType(this, StringListToScriptValue, StringListFromScriptValue);
190− scriptRegisterMetaType(this, VariantListToScriptValue, VariantListFromScriptValue);
191− scriptRegisterMetaType(this, VariantMapToScriptValue, VariantMapFromScriptValue);
192− scriptRegisterMetaType(this, VariantHashToScriptValue, VariantHashFromScriptValue);
193− scriptRegisterMetaType(this, JsonValueToScriptValue, JsonValueFromScriptValue);
194− scriptRegisterMetaType(this, JsonObjectToScriptValue, JsonObjectFromScriptValue);
195− scriptRegisterMetaType(this, JsonArrayToScriptValue, JsonArrayFromScriptValue);
189+ scriptRegisterMetaType<QStringList, StringListToScriptValue, StringListFromScriptValue>(this);
190+ scriptRegisterMetaType<QVariantList, VariantListToScriptValue, VariantListFromScriptValue>(this);
191+ scriptRegisterMetaType<QVariantMap, VariantMapToScriptValue, VariantMapFromScriptValue>(this);
192+ scriptRegisterMetaType<QVariantHash, VariantHashToScriptValue, VariantHashFromScriptValue>(this);
193+ scriptRegisterMetaType<QJsonValue, JsonValueToScriptValue, JsonValueFromScriptValue>(this);
194+ scriptRegisterMetaType<QJsonObject, JsonObjectToScriptValue, JsonObjectFromScriptValue>(this);
195+ scriptRegisterMetaType<QJsonArray, JsonArrayToScriptValue, JsonArrayFromScriptValue>(this);
196196 }
197197
198198 bool ScriptEngineQtScript::castValueToVariant(const QScriptValue& val, QVariant& dest, int destTypeId) {