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/items | |
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/items')
-rw-r--r-- | src/quick/items/qquickflickable.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickflickable_p_p.h | 4 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 36 | ||||
-rw-r--r-- | src/quick/items/qquickitem_p.h | 20 | ||||
-rw-r--r-- | src/quick/items/qquickmultipointtoucharea_p.h | 4 | ||||
-rw-r--r-- | src/quick/items/qquickspriteengine_p.h | 6 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 6 | ||||
-rw-r--r-- | src/quick/items/qquickwindow_p.h | 6 |
8 files changed, 43 insertions, 43 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 44b91e5316..960b02ea9c 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -1908,13 +1908,13 @@ void QQuickFlickablePrivate::data_append(QQmlListProperty<QObject> *prop, QObjec } } -int QQuickFlickablePrivate::data_count(QQmlListProperty<QObject> *) +qsizetype QQuickFlickablePrivate::data_count(QQmlListProperty<QObject> *) { // XXX todo return 0; } -QObject *QQuickFlickablePrivate::data_at(QQmlListProperty<QObject> *, int) +QObject *QQuickFlickablePrivate::data_at(QQmlListProperty<QObject> *, qsizetype) { // XXX todo return nullptr; diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index 93b78d90de..4d47943702 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_p.h @@ -273,8 +273,8 @@ public: // flickableData property static void data_append(QQmlListProperty<QObject> *, QObject *); - static int data_count(QQmlListProperty<QObject> *); - static QObject *data_at(QQmlListProperty<QObject> *, int); + static qsizetype data_count(QQmlListProperty<QObject> *); + static QObject *data_at(QQmlListProperty<QObject> *, qsizetype); static void data_clear(QQmlListProperty<QObject> *); }; diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 493b3e1590..547c825502 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3295,7 +3295,7 @@ void QQuickItemPrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o) automatically assigned to this property. */ -int QQuickItemPrivate::data_count(QQmlListProperty<QObject> *property) +qsizetype QQuickItemPrivate::data_count(QQmlListProperty<QObject> *property) { QQuickItem *item = static_cast<QQuickItem*>(property->object); QQuickItemPrivate *privateItem = QQuickItemPrivate::get(item); @@ -3305,17 +3305,17 @@ int QQuickItemPrivate::data_count(QQmlListProperty<QObject> *property) return resources_count(&resourcesProperty) + children_count(&childrenProperty); } -QObject *QQuickItemPrivate::data_at(QQmlListProperty<QObject> *property, int i) +QObject *QQuickItemPrivate::data_at(QQmlListProperty<QObject> *property, qsizetype i) { QQuickItem *item = static_cast<QQuickItem*>(property->object); QQuickItemPrivate *privateItem = QQuickItemPrivate::get(item); QQmlListProperty<QObject> resourcesProperty = privateItem->resources(); QQmlListProperty<QQuickItem> childrenProperty = privateItem->children(); - int resourcesCount = resources_count(&resourcesProperty); + qsizetype resourcesCount = resources_count(&resourcesProperty); if (i < resourcesCount) return resources_at(&resourcesProperty, i); - const int j = i - resourcesCount; + const qsizetype j = i - resourcesCount; if (j < children_count(&childrenProperty)) return children_at(&childrenProperty, j); return nullptr; @@ -3332,7 +3332,7 @@ void QQuickItemPrivate::data_clear(QQmlListProperty<QObject> *property) children_clear(&childrenProperty); } -QObject *QQuickItemPrivate::resources_at(QQmlListProperty<QObject> *prop, int index) +QObject *QQuickItemPrivate::resources_at(QQmlListProperty<QObject> *prop, qsizetype index) { QQuickItemPrivate *quickItemPrivate = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); return quickItemPrivate->extra.isAllocated() ? quickItemPrivate->extra->resourcesList.value(index) : 0; @@ -3349,7 +3349,7 @@ void QQuickItemPrivate::resources_append(QQmlListProperty<QObject> *prop, QObjec } } -int QQuickItemPrivate::resources_count(QQmlListProperty<QObject> *prop) +qsizetype QQuickItemPrivate::resources_count(QQmlListProperty<QObject> *prop) { QQuickItemPrivate *quickItemPrivate = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); return quickItemPrivate->extra.isAllocated() ? quickItemPrivate->extra->resourcesList.count() : 0; @@ -3368,7 +3368,7 @@ void QQuickItemPrivate::resources_clear(QQmlListProperty<QObject> *prop) } } -QQuickItem *QQuickItemPrivate::children_at(QQmlListProperty<QQuickItem> *prop, int index) +QQuickItem *QQuickItemPrivate::children_at(QQmlListProperty<QQuickItem> *prop, qsizetype index) { QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); if (index >= p->childItems.count() || index < 0) @@ -3389,7 +3389,7 @@ void QQuickItemPrivate::children_append(QQmlListProperty<QQuickItem> *prop, QQui o->setParentItem(that); } -int QQuickItemPrivate::children_count(QQmlListProperty<QQuickItem> *prop) +qsizetype QQuickItemPrivate::children_count(QQmlListProperty<QQuickItem> *prop) { QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); return p->childItems.count(); @@ -3403,11 +3403,11 @@ void QQuickItemPrivate::children_clear(QQmlListProperty<QQuickItem> *prop) p->childItems.at(0)->setParentItem(nullptr); } -int QQuickItemPrivate::visibleChildren_count(QQmlListProperty<QQuickItem> *prop) +qsizetype QQuickItemPrivate::visibleChildren_count(QQmlListProperty<QQuickItem> *prop) { QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); - int visibleCount = 0; - int c = p->childItems.count(); + qsizetype visibleCount = 0; + qsizetype c = p->childItems.count(); while (c--) { if (p->childItems.at(c)->isVisible()) visibleCount++; } @@ -3415,22 +3415,22 @@ int QQuickItemPrivate::visibleChildren_count(QQmlListProperty<QQuickItem> *prop) return visibleCount; } -QQuickItem *QQuickItemPrivate::visibleChildren_at(QQmlListProperty<QQuickItem> *prop, int index) +QQuickItem *QQuickItemPrivate::visibleChildren_at(QQmlListProperty<QQuickItem> *prop, qsizetype index) { QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); - const int childCount = p->childItems.count(); + const qsizetype childCount = p->childItems.count(); if (index >= childCount || index < 0) return nullptr; - int visibleCount = -1; - for (int i = 0; i < childCount; i++) { + qsizetype visibleCount = -1; + for (qsizetype i = 0; i < childCount; i++) { if (p->childItems.at(i)->isVisible()) visibleCount++; if (visibleCount == index) return p->childItems.at(i); } return nullptr; } -int QQuickItemPrivate::transform_count(QQmlListProperty<QQuickTransform> *prop) +qsizetype QQuickItemPrivate::transform_count(QQmlListProperty<QQuickTransform> *prop) { QQuickItem *that = static_cast<QQuickItem *>(prop->object); QQuickItemPrivate *p = QQuickItemPrivate::get(that); @@ -3485,7 +3485,7 @@ void QQuickItemPrivate::transform_append(QQmlListProperty<QQuickTransform> *prop transform->appendToItem(that); } -QQuickTransform *QQuickItemPrivate::transform_at(QQmlListProperty<QQuickTransform> *prop, int idx) +QQuickTransform *QQuickItemPrivate::transform_at(QQmlListProperty<QQuickTransform> *prop, qsizetype idx) { QQuickItem *that = static_cast<QQuickItem *>(prop->object); QQuickItemPrivate *p = QQuickItemPrivate::get(that); @@ -3501,7 +3501,7 @@ void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop) QQuickItem *that = static_cast<QQuickItem *>(prop->object); QQuickItemPrivate *p = QQuickItemPrivate::get(that); - for (int ii = 0; ii < p->transforms.count(); ++ii) { + for (qsizetype ii = 0; ii < p->transforms.count(); ++ii) { QQuickTransform *t = p->transforms.at(ii); QQuickTransformPrivate *tp = QQuickTransformPrivate::get(t); tp->items.removeOne(that); diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 68c5d59dfe..1e33eadeac 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -288,31 +288,31 @@ public: // data property static void data_append(QQmlListProperty<QObject> *, QObject *); - static int data_count(QQmlListProperty<QObject> *); - static QObject *data_at(QQmlListProperty<QObject> *, int); + static qsizetype data_count(QQmlListProperty<QObject> *); + static QObject *data_at(QQmlListProperty<QObject> *, qsizetype); static void data_clear(QQmlListProperty<QObject> *); // resources property - static QObject *resources_at(QQmlListProperty<QObject> *, int); + static QObject *resources_at(QQmlListProperty<QObject> *, qsizetype); static void resources_append(QQmlListProperty<QObject> *, QObject *); - static int resources_count(QQmlListProperty<QObject> *); + static qsizetype resources_count(QQmlListProperty<QObject> *); static void resources_clear(QQmlListProperty<QObject> *); // children property static void children_append(QQmlListProperty<QQuickItem> *, QQuickItem *); - static int children_count(QQmlListProperty<QQuickItem> *); - static QQuickItem *children_at(QQmlListProperty<QQuickItem> *, int); + static qsizetype children_count(QQmlListProperty<QQuickItem> *); + static QQuickItem *children_at(QQmlListProperty<QQuickItem> *, qsizetype); static void children_clear(QQmlListProperty<QQuickItem> *); // visibleChildren property static void visibleChildren_append(QQmlListProperty<QQuickItem> *prop, QQuickItem *o); - static int visibleChildren_count(QQmlListProperty<QQuickItem> *prop); - static QQuickItem *visibleChildren_at(QQmlListProperty<QQuickItem> *prop, int index); + static qsizetype visibleChildren_count(QQmlListProperty<QQuickItem> *prop); + static QQuickItem *visibleChildren_at(QQmlListProperty<QQuickItem> *prop, qsizetype index); // transform property - static int transform_count(QQmlListProperty<QQuickTransform> *list); + static qsizetype transform_count(QQmlListProperty<QQuickTransform> *list); static void transform_append(QQmlListProperty<QQuickTransform> *list, QQuickTransform *); - static QQuickTransform *transform_at(QQmlListProperty<QQuickTransform> *list, int); + static QQuickTransform *transform_at(QQmlListProperty<QQuickTransform> *list, qsizetype); static void transform_clear(QQmlListProperty<QQuickTransform> *list); void _q_resourceObjectDeleted(QObject *); diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h index 16e490adab..7b6426d3ab 100644 --- a/src/quick/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_p.h @@ -240,12 +240,12 @@ public: q->addTouchPrototype(touch); } - static int touchPoint_count(QQmlListProperty<QQuickTouchPoint> *list) { + static qsizetype touchPoint_count(QQmlListProperty<QQuickTouchPoint> *list) { QQuickMultiPointTouchArea *q = static_cast<QQuickMultiPointTouchArea*>(list->object); return q->_touchPrototypes.count(); } - static QQuickTouchPoint* touchPoint_at(QQmlListProperty<QQuickTouchPoint> *list, int index) { + static QQuickTouchPoint* touchPoint_at(QQmlListProperty<QQuickTouchPoint> *list, qsizetype index) { QQuickMultiPointTouchArea *q = static_cast<QQuickMultiPointTouchArea*>(list->object); return q->_touchPrototypes.value(index); } diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 5ad33389de..fb7b8e8bf1 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -314,7 +314,7 @@ inline void spriteAppend(QQmlListProperty<QQuickSprite> *p, QQuickSprite* s) p->object->metaObject()->invokeMethod(p->object, "createEngine"); } -inline QQuickSprite* spriteAt(QQmlListProperty<QQuickSprite> *p, int idx) +inline QQuickSprite* spriteAt(QQmlListProperty<QQuickSprite> *p, qsizetype idx) { return reinterpret_cast<QList<QQuickSprite *> *>(p->data)->at(idx); } @@ -325,12 +325,12 @@ inline void spriteClear(QQmlListProperty<QQuickSprite> *p) p->object->metaObject()->invokeMethod(p->object, "createEngine"); } -inline int spriteCount(QQmlListProperty<QQuickSprite> *p) +inline qsizetype spriteCount(QQmlListProperty<QQuickSprite> *p) { return reinterpret_cast<QList<QQuickSprite *> *>(p->data)->count(); } -inline void spriteReplace(QQmlListProperty<QQuickSprite> *p, int idx, QQuickSprite *s) +inline void spriteReplace(QQmlListProperty<QQuickSprite> *p, qsizetype idx, QQuickSprite *s) { reinterpret_cast<QList<QQuickSprite *> *>(p->data)->replace(idx, s); p->object->metaObject()->invokeMethod(p->object, "createEngine"); diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 384b334e9e..419ad5bb87 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3378,7 +3378,7 @@ void QQuickWindowPrivate::data_append(QQmlListProperty<QObject> *property, QObje itemProperty.append(&itemProperty, o); } -int QQuickWindowPrivate::data_count(QQmlListProperty<QObject> *property) +qsizetype QQuickWindowPrivate::data_count(QQmlListProperty<QObject> *property) { QQuickWindow *win = static_cast<QQuickWindow*>(property->object); if (!win || !win->contentItem() || !QQuickItemPrivate::get(win->contentItem())->data().count) @@ -3387,7 +3387,7 @@ int QQuickWindowPrivate::data_count(QQmlListProperty<QObject> *property) return itemProperty.count(&itemProperty); } -QObject *QQuickWindowPrivate::data_at(QQmlListProperty<QObject> *property, int i) +QObject *QQuickWindowPrivate::data_at(QQmlListProperty<QObject> *property, qsizetype i) { QQuickWindow *win = static_cast<QQuickWindow*>(property->object); QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(win->contentItem())->data(); @@ -3401,7 +3401,7 @@ void QQuickWindowPrivate::data_clear(QQmlListProperty<QObject> *property) itemProperty.clear(&itemProperty); } -void QQuickWindowPrivate::data_replace(QQmlListProperty<QObject> *property, int i, QObject *o) +void QQuickWindowPrivate::data_replace(QQmlListProperty<QObject> *property, qsizetype i, QObject *o) { QQuickWindow *win = static_cast<QQuickWindow*>(property->object); QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(win->contentItem())->data(); diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index 81c0ebef45..62b16513c9 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -330,10 +330,10 @@ public: // data property static void data_append(QQmlListProperty<QObject> *, QObject *); - static int data_count(QQmlListProperty<QObject> *); - static QObject *data_at(QQmlListProperty<QObject> *, int); + static qsizetype data_count(QQmlListProperty<QObject> *); + static QObject *data_at(QQmlListProperty<QObject> *, qsizetype); static void data_clear(QQmlListProperty<QObject> *); - static void data_replace(QQmlListProperty<QObject> *, int, QObject *); + static void data_replace(QQmlListProperty<QObject> *, qsizetype, QObject *); static void data_removeLast(QQmlListProperty<QObject> *); static void rhiCreationFailureMessage(const QString &backendName, |