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/types/qqmldelegatemodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/types/qqmldelegatemodel.cpp') diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 015458169a..4f7f92aca8 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -105,7 +105,7 @@ struct DelegateModelGroupFunction : QV4::FunctionObject if (!o) return scope.engine->throwTypeError(QStringLiteral("Not a valid VisualData object")); - QV4::ScopedValue v(scope, argc ? argv[0] : Primitive::undefinedValue()); + QV4::ScopedValue v(scope, argc ? argv[0] : Value::undefinedValue()); return f->d()->code(o->d()->item, f->d()->flag, v); } }; @@ -3476,7 +3476,7 @@ public: if (index >= array->count()) { if (hasProperty) *hasProperty = false; - return QV4::Primitive::undefinedValue().asReturnedValue(); + return QV4::Value::undefinedValue().asReturnedValue(); } const QQmlChangeSet::Change &change = array->at(index); -- cgit v1.2.3