diff options
Diffstat (limited to 'src/qml/qml/qqmllist.cpp')
| -rw-r--r-- | src/qml/qml/qqmllist.cpp | 149 |
1 files changed, 69 insertions, 80 deletions
diff --git a/src/qml/qml/qqmllist.cpp b/src/qml/qml/qqmllist.cpp index b266157d28..a166041070 100644 --- a/src/qml/qml/qqmllist.cpp +++ b/src/qml/qml/qqmllist.cpp @@ -1,68 +1,36 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qqmllist.h" #include "qqmllist_p.h" -#include "qqmlengine_p.h" -#include "qqmlproperty_p.h" +#include <QtQml/private/qqmlproperty_p.h> QT_BEGIN_NAMESPACE +static bool isObjectCompatible(QObject *object, QQmlListReferencePrivate *d) +{ + if (object) { + const QQmlMetaObject elementType = d->elementType(); + if (elementType.isNull() || !QQmlMetaObject::canConvert(object, elementType)) + return false; + } + return true; +} + QQmlListReferencePrivate::QQmlListReferencePrivate() -: propertyType(-1), refCount(1) +: refCount(1) { } -QQmlListReference QQmlListReferencePrivate::init(const QQmlListProperty<QObject> &prop, int propType, QQmlEngine *engine) +QQmlListReference QQmlListReferencePrivate::init( + const QQmlListProperty<QObject> &prop, QMetaType propType) { QQmlListReference rv; if (!prop.object) return rv; - QQmlEnginePrivate *p = engine?QQmlEnginePrivate::get(engine):nullptr; - - int listType = QQmlMetaType::listType(propType); - if (listType == -1) return rv; - rv.d = new QQmlListReferencePrivate; rv.d->object = prop.object; - rv.d->elementType = QQmlPropertyPrivate::rawMetaObjectForType(p, listType); rv.d->property = prop; rv.d->propertyType = propType; @@ -119,8 +87,10 @@ QQmlListReference::QQmlListReference() { } +#if QT_DEPRECATED_SINCE(6, 4) /*! \since 6.1 +\obsolete [6.4] Use the constructors without QQmlEngine argument instead. Constructs a QQmlListReference from a QVariant \a variant containing a QQmlListProperty. If \a variant does not contain a list property, an invalid QQmlListReference is created. If the object @@ -128,26 +98,46 @@ owning the list property is destroyed after the reference is constructed, it wil become invalid. That is, it is safe to hold QQmlListReference instances even after the object is deleted. -The \a engine is required to look up the element type, which may be a dynamically created QML type. -If it's omitted, only pre-registered types are available. +The \a engine is unused. */ -QQmlListReference::QQmlListReference(const QVariant &variant, QQmlEngine *engine) +QQmlListReference::QQmlListReference(const QVariant &variant, [[maybe_unused]] QQmlEngine *engine) + : QQmlListReference(variant) +{} + +/*! +\obsolete [6.4] Use the constructors without QQmlEngine argument instead. + +Constructs a QQmlListReference for \a object's \a property. If \a property is not a list +property, an invalid QQmlListReference is created. If \a object is destroyed after +the reference is constructed, it will automatically become invalid. That is, it is safe to hold +QQmlListReference instances even after \a object is deleted. + +The \a engine is unused. +*/ +QQmlListReference::QQmlListReference(QObject *object, const char *property, + [[maybe_unused]] QQmlEngine *engine) + : QQmlListReference(object, property) +{} +#endif + +/*! +\since 6.1 + +Constructs a QQmlListReference from a QVariant \a variant containing a QQmlListProperty. If +\a variant does not contain a list property, an invalid QQmlListReference is created. If the object +owning the list property is destroyed after the reference is constructed, it will automatically +become invalid. That is, it is safe to hold QQmlListReference instances even after the object is +deleted. +*/ +QQmlListReference::QQmlListReference(const QVariant &variant) : d(nullptr) { const QMetaType t = variant.metaType(); if (!(t.flags() & QMetaType::IsQmlList)) return; - QQmlEnginePrivate *p = engine ? QQmlEnginePrivate::get(engine) : nullptr; - const int listType = QQmlMetaType::listType(t.id()); - if (listType == -1) - return; - d = new QQmlListReferencePrivate; - d->propertyType = t.id(); - d->elementType = p - ? p->rawMetaObjectForType(listType) - : QQmlMetaType::qmlType(listType).baseMetaObject(); + d->propertyType = t; d->property.~QQmlListProperty(); t.construct(&d->property, variant.constData()); @@ -160,30 +150,21 @@ Constructs a QQmlListReference for \a object's \a property. If \a property is n property, an invalid QQmlListReference is created. If \a object is destroyed after the reference is constructed, it will automatically become invalid. That is, it is safe to hold QQmlListReference instances even after \a object is deleted. - -Passing \a engine is required to access some QML created list properties. If in doubt, and an engine -is available, pass it. */ -QQmlListReference::QQmlListReference(QObject *object, const char *property, QQmlEngine *engine) -: d(nullptr) +QQmlListReference::QQmlListReference(QObject *object, const char *property) + : d(nullptr) { if (!object || !property) return; QQmlPropertyData local; - QQmlPropertyData *data = - QQmlPropertyCache::property(engine, object, QLatin1String(property), nullptr, &local); + const QQmlPropertyData *data = + QQmlPropertyCache::property(object, QLatin1String(property), nullptr, &local); if (!data || !data->isQList()) return; - QQmlEnginePrivate *p = engine?QQmlEnginePrivate::get(engine):nullptr; - - int listType = QQmlMetaType::listType(data->propType().id()); - if (listType == -1) return; - d = new QQmlListReferencePrivate; d->object = object; - d->elementType = p ? p->rawMetaObjectForType(listType) : QQmlMetaType::qmlType(listType).baseMetaObject(); - d->propertyType = data->propType().id(); + d->propertyType = data->propType(); void *args[] = { &d->property, nullptr }; QMetaObject::metacall(object, QMetaObject::ReadProperty, data->coreIndex(), args); @@ -233,12 +214,11 @@ Returns the QMetaObject for the elements stored in the list property, or \nullptr if the reference is invalid. The QMetaObject can be used ahead of time to determine whether a given instance can be added -to a list. +to a list. If you didn't pass an engine on construction this may return nullptr. */ const QMetaObject *QQmlListReference::listElementType() const { - if (isValid()) return d->elementType.metaObject(); - else return nullptr; + return isValid() ? d->elementType() : nullptr; } /*! @@ -347,7 +327,7 @@ bool QQmlListReference::append(QObject *object) const { if (!canAppend()) return false; - if (object && !QQmlMetaObject::canConvert(object, d->elementType)) + if (!isObjectCompatible(object, d)) return false; d->property.append(&d->property, object); @@ -392,6 +372,12 @@ qsizetype QQmlListReference::count() const } /*! +\fn qsizetype QQmlListReference::size() const +\since 6.2 +Returns the number of objects in the list, or 0 if the operation failed. +*/ + +/*! Replaces the item at \a index in the list with \a object. Returns true if the operation succeeded, otherwise false. @@ -402,7 +388,7 @@ bool QQmlListReference::replace(qsizetype index, QObject *object) const if (!canReplace()) return false; - if (object && !QQmlMetaObject::canConvert(object, d->elementType)) + if (!isObjectCompatible(object, d)) return false; d->property.replace(&d->property, index, object); @@ -461,7 +447,7 @@ Q_PROPERTY(QQmlListProperty<Fruit> fruit READ fruit) QML list properties are type-safe - in this case \c {Fruit} is a QObject type that \c {Apple}, \c {Orange} and \c {Banana} all derive from. -\sa {Extending QML - Object and List Property Types Example} +\sa {Chapter 5: Using List Property Types} */ /*! @@ -476,6 +462,7 @@ QML list properties are type-safe - in this case \c {Fruit} is a QObject type th \sa QML_LIST_PROPERTY_ASSIGN_BEHAVIOR_REPLACE_IF_NOT_DEFAULT \sa QML_LIST_PROPERTY_ASSIGN_BEHAVIOR_REPLACE + \sa {Defining Object Types through QML Documents} */ /*! @@ -492,6 +479,7 @@ QML list properties are type-safe - in this case \c {Fruit} is a QObject type th \sa QML_LIST_PROPERTY_ASSIGN_BEHAVIOR_APPEND \sa QML_LIST_PROPERTY_ASSIGN_BEHAVIOR_REPLACE + \sa {Defining Object Types through QML Documents} */ /*! @@ -506,6 +494,7 @@ QML list properties are type-safe - in this case \c {Fruit} is a QObject type th \sa QML_LIST_PROPERTY_ASSIGN_BEHAVIOR_APPEND \sa QML_LIST_PROPERTY_ASSIGN_BEHAVIOR_REPLACE_IF_NOT_DEFAULT + \sa {Defining Object Types through QML Documents} */ /*! |