From 1dac47c1418b44cf4a56b42bfca2b277795fd213 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 11 Sep 2018 11:07:32 +0200 Subject: Cleanups in Value/Primitive Get rid of Primitive and move the corresponding methods directly into Value. Mark many methods in Value as constexpr and turn Value into a POD type again. Keep Primitive as a pure alias to Value for source compatibility of other modules that might be using it. Change-Id: Icb47458947dd3482c8852e95782123ea4346f5ec Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlboundsignal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/qml/qqmlboundsignal.cpp') diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 82c7921e0c..e5b78591e0 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -209,12 +209,12 @@ void QQmlBoundSignalExpression::evaluate(void **a) jsCall->args[ii] = scope.engine->fromVariant(*((QVariant *)a[ii + 1])); } else if (type == QMetaType::Int) { //### optimization. Can go away if we switch to metaTypeToJS, or be expanded otherwise - jsCall->args[ii] = QV4::Primitive::fromInt32(*reinterpret_cast(a[ii + 1])); + jsCall->args[ii] = QV4::Value::fromInt32(*reinterpret_cast(a[ii + 1])); } else if (type == qMetaTypeId()) { jsCall->args[ii] = *reinterpret_cast(a[ii + 1]); } else if (ep->isQObject(type)) { if (!*reinterpret_cast(a[ii + 1])) - jsCall->args[ii] = QV4::Primitive::nullValue(); + jsCall->args[ii] = QV4::Value::nullValue(); else jsCall->args[ii] = QV4::QObjectWrapper::wrap(v4, *reinterpret_cast(a[ii + 1])); } else { -- cgit v1.2.3