diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-11-09 10:46:07 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-11-09 18:09:30 +0100 |
commit | d7008c79d4ec023527ebfc118ad47f40075f244d (patch) | |
tree | ce4e1b3e4148820fd5682ee1877a7626274cdb59 /src/quick/util | |
parent | 5824283a7804e7975140c17731329786045ef432 (diff) |
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 <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/util')
-rw-r--r-- | src/quick/util/qquickanimation.cpp | 6 | ||||
-rw-r--r-- | src/quick/util/qquickanimation_p_p.h | 6 | ||||
-rw-r--r-- | src/quick/util/qquickapplication.cpp | 4 | ||||
-rw-r--r-- | src/quick/util/qquickpath.cpp | 4 | ||||
-rw-r--r-- | src/quick/util/qquickpath_p.h | 4 | ||||
-rw-r--r-- | src/quick/util/qquickstate_p_p.h | 6 | ||||
-rw-r--r-- | src/quick/util/qquickstategroup.cpp | 22 | ||||
-rw-r--r-- | src/quick/util/qquicktransition.cpp | 8 |
8 files changed, 30 insertions, 30 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index b2fb0a4e1b..cfa8d3a51a 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -1724,14 +1724,14 @@ void QQuickAnimationGroupPrivate::append_animation(QQmlListProperty<QQuickAbstra a->setGroup(q); } -QQuickAbstractAnimation *QQuickAnimationGroupPrivate::at_animation(QQmlListProperty<QQuickAbstractAnimation> *list, int index) +QQuickAbstractAnimation *QQuickAnimationGroupPrivate::at_animation(QQmlListProperty<QQuickAbstractAnimation> *list, qsizetype index) { if (auto q = qmlobject_cast<QQuickAnimationGroup *>(list->object)) return q->d_func()->animations.at(index); return nullptr; } -int QQuickAnimationGroupPrivate::count_animation(QQmlListProperty<QQuickAbstractAnimation> *list) +qsizetype QQuickAnimationGroupPrivate::count_animation(QQmlListProperty<QQuickAbstractAnimation> *list) { if (auto q = qmlobject_cast<QQuickAnimationGroup *>(list->object)) return q->d_func()->animations.count(); @@ -1750,7 +1750,7 @@ void QQuickAnimationGroupPrivate::clear_animation(QQmlListProperty<QQuickAbstrac } void QQuickAnimationGroupPrivate::replace_animation(QQmlListProperty<QQuickAbstractAnimation> *list, - int i, QQuickAbstractAnimation *a) + qsizetype i, QQuickAbstractAnimation *a) { if (auto *q = qmlobject_cast<QQuickAnimationGroup *>(list->object)) { if (QQuickAbstractAnimation *anim = q->d_func()->animations.at(i)) diff --git a/src/quick/util/qquickanimation_p_p.h b/src/quick/util/qquickanimation_p_p.h index 8d23242b68..98d4751d1f 100644 --- a/src/quick/util/qquickanimation_p_p.h +++ b/src/quick/util/qquickanimation_p_p.h @@ -256,10 +256,10 @@ public: : QQuickAbstractAnimationPrivate() {} static void append_animation(QQmlListProperty<QQuickAbstractAnimation> *list, QQuickAbstractAnimation *role); - static QQuickAbstractAnimation *at_animation(QQmlListProperty<QQuickAbstractAnimation> *list, int index); - static int count_animation(QQmlListProperty<QQuickAbstractAnimation> *list); + static QQuickAbstractAnimation *at_animation(QQmlListProperty<QQuickAbstractAnimation> *list, qsizetype index); + static qsizetype count_animation(QQmlListProperty<QQuickAbstractAnimation> *list); static void clear_animation(QQmlListProperty<QQuickAbstractAnimation> *list); - static void replace_animation(QQmlListProperty<QQuickAbstractAnimation> *list, int index, + static void replace_animation(QQmlListProperty<QQuickAbstractAnimation> *list, qsizetype index, QQuickAbstractAnimation *role); static void removeLast_animation(QQmlListProperty<QQuickAbstractAnimation> *list); QList<QQuickAbstractAnimation *> animations; diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp index fef87bd931..1c0522451a 100644 --- a/src/quick/util/qquickapplication.cpp +++ b/src/quick/util/qquickapplication.cpp @@ -113,12 +113,12 @@ void QQuickApplication::setDisplayName(const QString &displayName) return QGuiApplication::setApplicationDisplayName(displayName); } -int screens_count(QQmlListProperty<QQuickScreenInfo> *prop) +qsizetype screens_count(QQmlListProperty<QQuickScreenInfo> *prop) { return static_cast<QVector<QQuickScreenInfo *> *>(prop->data)->count(); } -QQuickScreenInfo *screens_at(QQmlListProperty<QQuickScreenInfo> *prop, int idx) +QQuickScreenInfo *screens_at(QQmlListProperty<QQuickScreenInfo> *prop, qsizetype idx) { return static_cast<QVector<QQuickScreenInfo *> *>(prop->data)->at(idx); } diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp index 74ee52b1d3..5ac28f45d9 100644 --- a/src/quick/util/qquickpath.cpp +++ b/src/quick/util/qquickpath.cpp @@ -283,7 +283,7 @@ static QQuickPathPrivate *privatePath(QObject *object) return QQuickPathPrivate::get(path); } -QQuickPathElement *QQuickPath::pathElements_at(QQmlListProperty<QQuickPathElement> *property, int index) +QQuickPathElement *QQuickPath::pathElements_at(QQmlListProperty<QQuickPathElement> *property, qsizetype index) { QQuickPathPrivate *d = privatePath(property->object); @@ -315,7 +315,7 @@ void QQuickPath::pathElements_append(QQmlListProperty<QQuickPathElement> *proper } } -int QQuickPath::pathElements_count(QQmlListProperty<QQuickPathElement> *property) +qsizetype QQuickPath::pathElements_count(QQmlListProperty<QQuickPathElement> *property) { QQuickPathPrivate *d = privatePath(property->object); diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h index 8660537587..51321ce58c 100644 --- a/src/quick/util/qquickpath_p.h +++ b/src/quick/util/qquickpath_p.h @@ -568,9 +568,9 @@ protected: void gatherAttributes(); // pathElements property - static QQuickPathElement *pathElements_at(QQmlListProperty<QQuickPathElement> *, int); + static QQuickPathElement *pathElements_at(QQmlListProperty<QQuickPathElement> *, qsizetype); static void pathElements_append(QQmlListProperty<QQuickPathElement> *, QQuickPathElement *); - static int pathElements_count(QQmlListProperty<QQuickPathElement> *); + static qsizetype pathElements_count(QQmlListProperty<QQuickPathElement> *); static void pathElements_clear(QQmlListProperty<QQuickPathElement> *); private Q_SLOTS: diff --git a/src/quick/util/qquickstate_p_p.h b/src/quick/util/qquickstate_p_p.h index ae4ed291b5..6f9bb180bc 100644 --- a/src/quick/util/qquickstate_p_p.h +++ b/src/quick/util/qquickstate_p_p.h @@ -236,15 +236,15 @@ public: e->setState(nullptr); list->clear(); } - static int operations_count(QQmlListProperty<QQuickStateOperation> *prop) { + static qsizetype operations_count(QQmlListProperty<QQuickStateOperation> *prop) { QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data); return list->count(); } - static QQuickStateOperation *operations_at(QQmlListProperty<QQuickStateOperation> *prop, int index) { + static QQuickStateOperation *operations_at(QQmlListProperty<QQuickStateOperation> *prop, qsizetype index) { QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data); return list->at(index); } - static void operations_replace(QQmlListProperty<QQuickStateOperation> *prop, int index, + static void operations_replace(QQmlListProperty<QQuickStateOperation> *prop, qsizetype index, QQuickStateOperation *op) { QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data); auto &guard = list->at(index); diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp index 9cb3e26c04..b86333943c 100644 --- a/src/quick/util/qquickstategroup.cpp +++ b/src/quick/util/qquickstategroup.cpp @@ -67,15 +67,15 @@ public: QQuickState *nullState; static void append_state(QQmlListProperty<QQuickState> *list, QQuickState *state); - static int count_state(QQmlListProperty<QQuickState> *list); - static QQuickState *at_state(QQmlListProperty<QQuickState> *list, int index); + static qsizetype count_state(QQmlListProperty<QQuickState> *list); + static QQuickState *at_state(QQmlListProperty<QQuickState> *list, qsizetype index); static void clear_states(QQmlListProperty<QQuickState> *list); - static void replace_states(QQmlListProperty<QQuickState> *list, int index, QQuickState *state); + static void replace_states(QQmlListProperty<QQuickState> *list, qsizetype index, QQuickState *state); static void removeLast_states(QQmlListProperty<QQuickState> *list); static void append_transition(QQmlListProperty<QQuickTransition> *list, QQuickTransition *state); - static int count_transitions(QQmlListProperty<QQuickTransition> *list); - static QQuickTransition *at_transition(QQmlListProperty<QQuickTransition> *list, int index); + static qsizetype count_transitions(QQmlListProperty<QQuickTransition> *list); + static QQuickTransition *at_transition(QQmlListProperty<QQuickTransition> *list, qsizetype index); static void clear_transitions(QQmlListProperty<QQuickTransition> *list); QList<QQuickState *> states; @@ -184,13 +184,13 @@ void QQuickStateGroupPrivate::append_state(QQmlListProperty<QQuickState> *list, } -int QQuickStateGroupPrivate::count_state(QQmlListProperty<QQuickState> *list) +qsizetype QQuickStateGroupPrivate::count_state(QQmlListProperty<QQuickState> *list) { QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object); return _this->d_func()->states.count(); } -QQuickState *QQuickStateGroupPrivate::at_state(QQmlListProperty<QQuickState> *list, int index) +QQuickState *QQuickStateGroupPrivate::at_state(QQmlListProperty<QQuickState> *list, qsizetype index) { QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object); return _this->d_func()->states.at(index); @@ -200,13 +200,13 @@ void QQuickStateGroupPrivate::clear_states(QQmlListProperty<QQuickState> *list) { QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object); _this->d_func()->setCurrentStateInternal(QString(), true); - for (int i = 0; i < _this->d_func()->states.count(); ++i) { + for (qsizetype i = 0; i < _this->d_func()->states.count(); ++i) { _this->d_func()->states.at(i)->setStateGroup(nullptr); } _this->d_func()->states.clear(); } -void QQuickStateGroupPrivate::replace_states(QQmlListProperty<QQuickState> *list, int index, QQuickState *state) +void QQuickStateGroupPrivate::replace_states(QQmlListProperty<QQuickState> *list, qsizetype index, QQuickState *state) { auto *self = qobject_cast<QQuickStateGroup *>(list->object); auto *d = self->d_func(); @@ -265,13 +265,13 @@ void QQuickStateGroupPrivate::append_transition(QQmlListProperty<QQuickTransitio _this->d_func()->transitions.append(trans); } -int QQuickStateGroupPrivate::count_transitions(QQmlListProperty<QQuickTransition> *list) +qsizetype QQuickStateGroupPrivate::count_transitions(QQmlListProperty<QQuickTransition> *list) { QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object); return _this->d_func()->transitions.count(); } -QQuickTransition *QQuickStateGroupPrivate::at_transition(QQmlListProperty<QQuickTransition> *list, int index) +QQuickTransition *QQuickStateGroupPrivate::at_transition(QQmlListProperty<QQuickTransition> *list, qsizetype index) { QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object); return _this->d_func()->transitions.at(index); diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp index b973309212..2f736e8aca 100644 --- a/src/quick/util/qquicktransition.cpp +++ b/src/quick/util/qquicktransition.cpp @@ -135,8 +135,8 @@ public: protected: static void append_animation(QQmlListProperty<QQuickAbstractAnimation> *list, QQuickAbstractAnimation *a); - static int animation_count(QQmlListProperty<QQuickAbstractAnimation> *list); - static QQuickAbstractAnimation* animation_at(QQmlListProperty<QQuickAbstractAnimation> *list, int pos); + static qsizetype animation_count(QQmlListProperty<QQuickAbstractAnimation> *list); + static QQuickAbstractAnimation* animation_at(QQmlListProperty<QQuickAbstractAnimation> *list, qsizetype pos); static void clear_animations(QQmlListProperty<QQuickAbstractAnimation> *list); QList<QQuickAbstractAnimation *> animations; }; @@ -148,13 +148,13 @@ void QQuickTransitionPrivate::append_animation(QQmlListProperty<QQuickAbstractAn a->setDisableUserControl(); } -int QQuickTransitionPrivate::animation_count(QQmlListProperty<QQuickAbstractAnimation> *list) +qsizetype QQuickTransitionPrivate::animation_count(QQmlListProperty<QQuickAbstractAnimation> *list) { QQuickTransition *q = static_cast<QQuickTransition *>(list->object); return q->d_func()->animations.count(); } -QQuickAbstractAnimation* QQuickTransitionPrivate::animation_at(QQmlListProperty<QQuickAbstractAnimation> *list, int pos) +QQuickAbstractAnimation* QQuickTransitionPrivate::animation_at(QQmlListProperty<QQuickAbstractAnimation> *list, qsizetype pos) { QQuickTransition *q = static_cast<QQuickTransition *>(list->object); return q->d_func()->animations.at(pos); |