From d7008c79d4ec023527ebfc118ad47f40075f244d Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 9 Nov 2020 10:46:07 +0100 Subject: QQmlListProperty: Use qsizetype rather than int for sizes [ChangeLog][QtQml] The QQmlListProperty callback functions use qsizetype now as type for the size of a list. This is in line with the containers that you might use to back the list. Fixes: QTBUG-88269 Change-Id: Ia38403cb32f241e6c70e1a580dbeff1d6d694331 Reviewed-by: Fabian Kosmale --- src/qmlmodels/qqmldelegatemodel.cpp | 4 ++-- src/qmlmodels/qqmldelegatemodel_p_p.h | 4 ++-- src/qmlmodels/qqmllistaccessor.cpp | 4 ++-- src/qmlmodels/qqmllistaccessor_p.h | 4 ++-- src/qmlmodels/qqmlobjectmodel.cpp | 8 ++++---- src/qmlmodels/qquickpackage.cpp | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/qmlmodels') diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp index 5f6fe93dc8..1a053e2e31 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -697,7 +697,7 @@ void QQmlDelegateModelPrivate::group_append( d->m_groupCount += 1; } -int QQmlDelegateModelPrivate::group_count( +qsizetype QQmlDelegateModelPrivate::group_count( QQmlListProperty *property) { QQmlDelegateModelPrivate *d = static_cast(property->data); @@ -705,7 +705,7 @@ int QQmlDelegateModelPrivate::group_count( } QQmlDelegateModelGroup *QQmlDelegateModelPrivate::group_at( - QQmlListProperty *property, int index) + QQmlListProperty *property, qsizetype index) { QQmlDelegateModelPrivate *d = static_cast(property->data); return index >= 0 && index < d->m_groupCount - 1 diff --git a/src/qmlmodels/qqmldelegatemodel_p_p.h b/src/qmlmodels/qqmldelegatemodel_p_p.h index 491e8025b8..a1c9e7f583 100644 --- a/src/qmlmodels/qqmldelegatemodel_p_p.h +++ b/src/qmlmodels/qqmldelegatemodel_p_p.h @@ -338,8 +338,8 @@ public: int adaptorModelCount() const; static void group_append(QQmlListProperty *property, QQmlDelegateModelGroup *group); - static int group_count(QQmlListProperty *property); - static QQmlDelegateModelGroup *group_at(QQmlListProperty *property, int index); + static qsizetype group_count(QQmlListProperty *property); + static QQmlDelegateModelGroup *group_at(QQmlListProperty *property, qsizetype index); void releaseIncubator(QQDMIncubationTask *incubationTask); void incubatorStatusChanged(QQDMIncubationTask *incubationTask, QQmlIncubator::Status status); diff --git a/src/qmlmodels/qqmllistaccessor.cpp b/src/qmlmodels/qqmllistaccessor.cpp index 21481b8067..5e3fb86510 100644 --- a/src/qmlmodels/qqmllistaccessor.cpp +++ b/src/qmlmodels/qqmllistaccessor.cpp @@ -115,7 +115,7 @@ void QQmlListAccessor::setList(const QVariant &v, QQmlEngine *engine) } } -int QQmlListAccessor::count() const +qsizetype QQmlListAccessor::count() const { switch(m_type) { case StringList: @@ -136,7 +136,7 @@ int QQmlListAccessor::count() const } } -QVariant QQmlListAccessor::at(int idx) const +QVariant QQmlListAccessor::at(qsizetype idx) const { Q_ASSERT(idx >= 0 && idx < count()); switch(m_type) { diff --git a/src/qmlmodels/qqmllistaccessor_p.h b/src/qmlmodels/qqmllistaccessor_p.h index a57e4173e3..3306396b00 100644 --- a/src/qmlmodels/qqmllistaccessor_p.h +++ b/src/qmlmodels/qqmllistaccessor_p.h @@ -67,8 +67,8 @@ public: bool isValid() const; - int count() const; - QVariant at(int) const; + qsizetype count() const; + QVariant at(qsizetype) const; enum Type { Invalid, StringList, VariantList, ObjectList, ListProperty, Instance, Integer }; Type type() const { return m_type; } diff --git a/src/qmlmodels/qqmlobjectmodel.cpp b/src/qmlmodels/qqmlobjectmodel.cpp index b498f3567d..19aaaae88e 100644 --- a/src/qmlmodels/qqmlobjectmodel.cpp +++ b/src/qmlmodels/qqmlobjectmodel.cpp @@ -75,15 +75,15 @@ public: QQmlObjectModelPrivate() : QObjectPrivate(), moveId(0) {} static void children_append(QQmlListProperty *prop, QObject *item) { - int index = static_cast(prop->data)->children.count(); + qsizetype index = static_cast(prop->data)->children.count(); static_cast(prop->data)->insert(index, item); } - static int children_count(QQmlListProperty *prop) { + static qsizetype children_count(QQmlListProperty *prop) { return static_cast(prop->data)->children.count(); } - static QObject *children_at(QQmlListProperty *prop, int index) { + static QObject *children_at(QQmlListProperty *prop, qsizetype index) { return static_cast(prop->data)->children.at(index).item; } @@ -91,7 +91,7 @@ public: static_cast(prop->data)->clear(); } - static void children_replace(QQmlListProperty *prop, int index, QObject *item) { + static void children_replace(QQmlListProperty *prop, qsizetype index, QObject *item) { static_cast(prop->data)->replace(index, item); } diff --git a/src/qmlmodels/qquickpackage.cpp b/src/qmlmodels/qquickpackage.cpp index 42e7d0e09f..f16cb2381e 100644 --- a/src/qmlmodels/qquickpackage.cpp +++ b/src/qmlmodels/qquickpackage.cpp @@ -107,15 +107,15 @@ public: QList *list = static_cast *>(prop->data); list->clear(); } - static QObject *data_at(QQmlListProperty *prop, int index) { + static QObject *data_at(QQmlListProperty *prop, qsizetype index) { QList *list = static_cast *>(prop->data); return list->at(index); } - static int data_count(QQmlListProperty *prop) { + static qsizetype data_count(QQmlListProperty *prop) { QList *list = static_cast *>(prop->data); return list->count(); } - static void data_replace(QQmlListProperty *prop, int index, QObject *o) { + static void data_replace(QQmlListProperty *prop, qsizetype index, QObject *o) { QList *list = static_cast *>(prop->data); list->replace(index, DataGuard(o, list)); } -- cgit v1.2.3