Follow up on change of QQmlListProperty to qsizetype

This deals with d7008c79d4ec023527ebfc118ad47f40075f244d in
qtdeclarative which aligned QQmlListProperty with our container types.
Note: not changing the respective APIs of the QQuick classes
in this change. Ie. QQuickPlatformMenu::insertItem still operates on
int as index, and QQuickMenuPrivate still stores currentIndex as int.
This might need to be addressed in a follow-up commit.

Fixes: QTBUG-88362
Change-Id: Ia663cfa47fa91c55997cdef288b2a866107a5f25
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

6 files changed, 26 insertions, 26 deletions

diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp
index 88338024..2ff01e69 100644
--- a/src/imports/platform/qquickplatformmenu.cpp
+++ b/src/imports/platform/qquickplatformmenu.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Labs Platform module of the Qt Toolkit.
@@ -839,13 +839,13 @@ void QQuickPlatformMenu::data_append(QQmlListProperty<QObject> *property, QObjec
         menu->m_data.append(object);
 }
 
-int QQuickPlatformMenu::data_count(QQmlListProperty<QObject> *property)
+qsizetype QQuickPlatformMenu::data_count(QQmlListProperty<QObject> *property)
 {
     QQuickPlatformMenu *menu = static_cast<QQuickPlatformMenu *>(property->object);
     return menu->m_data.count();
 }
 
-QObject *QQuickPlatformMenu::data_at(QQmlListProperty<QObject> *property, int index)
+QObject *QQuickPlatformMenu::data_at(QQmlListProperty<QObject> *property, qsizetype index)
 {
     QQuickPlatformMenu *menu = static_cast<QQuickPlatformMenu *>(property->object);
     return menu->m_data.value(index);
@@ -863,13 +863,13 @@ void QQuickPlatformMenu::items_append(QQmlListProperty<QQuickPlatformMenuItem> *
     menu->addItem(item);
 }
 
-int QQuickPlatformMenu::items_count(QQmlListProperty<QQuickPlatformMenuItem> *property)
+qsizetype QQuickPlatformMenu::items_count(QQmlListProperty<QQuickPlatformMenuItem> *property)
 {
     QQuickPlatformMenu *menu = static_cast<QQuickPlatformMenu *>(property->object);
     return menu->m_items.count();
 }
 
-QQuickPlatformMenuItem *QQuickPlatformMenu::items_at(QQmlListProperty<QQuickPlatformMenuItem> *property, int index)
+QQuickPlatformMenuItem *QQuickPlatformMenu::items_at(QQmlListProperty<QQuickPlatformMenuItem> *property, qsizetype index)
 {
     QQuickPlatformMenu *menu = static_cast<QQuickPlatformMenu *>(property->object);
     return menu->m_items.value(index);
diff --git a/src/imports/platform/qquickplatformmenu_p.h b/src/imports/platform/qquickplatformmenu_p.h
index b573b0d4..fc66b61b 100644
--- a/src/imports/platform/qquickplatformmenu_p.h
+++ b/src/imports/platform/qquickplatformmenu_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Labs Platform module of the Qt Toolkit.
@@ -173,13 +173,13 @@ protected:
     QWindow *findWindow(QQuickItem *target, QPoint *offset) const;
 
     static void data_append(QQmlListProperty<QObject> *property, QObject *object);
-    static int data_count(QQmlListProperty<QObject> *property);
-    static QObject *data_at(QQmlListProperty<QObject> *property, int index);
+    static qsizetype data_count(QQmlListProperty<QObject> *property);
+    static QObject *data_at(QQmlListProperty<QObject> *property, qsizetype index);
     static void data_clear(QQmlListProperty<QObject> *property);
 
     static void items_append(QQmlListProperty<QQuickPlatformMenuItem> *property, QQuickPlatformMenuItem *item);
-    static int items_count(QQmlListProperty<QQuickPlatformMenuItem> *property);
-    static QQuickPlatformMenuItem *items_at(QQmlListProperty<QQuickPlatformMenuItem> *property, int index);
+    static qsizetype items_count(QQmlListProperty<QQuickPlatformMenuItem> *property);
+    static QQuickPlatformMenuItem *items_at(QQmlListProperty<QQuickPlatformMenuItem> *property, qsizetype index);
     static void items_clear(QQmlListProperty<QQuickPlatformMenuItem> *property);
 
 private Q_SLOTS:
diff --git a/src/imports/platform/qquickplatformmenubar.cpp b/src/imports/platform/qquickplatformmenubar.cpp
index e77e1f28..aa2e4204 100644
--- a/src/imports/platform/qquickplatformmenubar.cpp
+++ b/src/imports/platform/qquickplatformmenubar.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Labs Platform module of the Qt Toolkit.
@@ -286,13 +286,13 @@ void QQuickPlatformMenuBar::data_append(QQmlListProperty<QObject> *property, QOb
         menuBar->m_data.append(object);
 }
 
-int QQuickPlatformMenuBar::data_count(QQmlListProperty<QObject> *property)
+qsizetype QQuickPlatformMenuBar::data_count(QQmlListProperty<QObject> *property)
 {
     QQuickPlatformMenuBar *menuBar = static_cast<QQuickPlatformMenuBar *>(property->object);
     return menuBar->m_data.count();
 }
 
-QObject *QQuickPlatformMenuBar::data_at(QQmlListProperty<QObject> *property, int index)
+QObject *QQuickPlatformMenuBar::data_at(QQmlListProperty<QObject> *property, qsizetype index)
 {
     QQuickPlatformMenuBar *menuBar = static_cast<QQuickPlatformMenuBar *>(property->object);
     return menuBar->m_data.value(index);
@@ -310,13 +310,13 @@ void QQuickPlatformMenuBar::menus_append(QQmlListProperty<QQuickPlatformMenu> *p
     menuBar->addMenu(menu);
 }
 
-int QQuickPlatformMenuBar::menus_count(QQmlListProperty<QQuickPlatformMenu> *property)
+qsizetype QQuickPlatformMenuBar::menus_count(QQmlListProperty<QQuickPlatformMenu> *property)
 {
     QQuickPlatformMenuBar *menuBar = static_cast<QQuickPlatformMenuBar *>(property->object);
     return menuBar->m_menus.count();
 }
 
-QQuickPlatformMenu *QQuickPlatformMenuBar::menus_at(QQmlListProperty<QQuickPlatformMenu> *property, int index)
+QQuickPlatformMenu *QQuickPlatformMenuBar::menus_at(QQmlListProperty<QQuickPlatformMenu> *property, qsizetype index)
 {
     QQuickPlatformMenuBar *menuBar = static_cast<QQuickPlatformMenuBar *>(property->object);
     return menuBar->m_menus.value(index);
diff --git a/src/imports/platform/qquickplatformmenubar_p.h b/src/imports/platform/qquickplatformmenubar_p.h
index d4573976..e644c86c 100644
--- a/src/imports/platform/qquickplatformmenubar_p.h
+++ b/src/imports/platform/qquickplatformmenubar_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Labs Platform module of the Qt Toolkit.
@@ -96,13 +96,13 @@ protected:
     QWindow *findWindow() const;
 
     static void data_append(QQmlListProperty<QObject> *property, QObject *object);
-    static int data_count(QQmlListProperty<QObject> *property);
-    static QObject *data_at(QQmlListProperty<QObject> *property, int index);
+    static qsizetype data_count(QQmlListProperty<QObject> *property);
+    static QObject *data_at(QQmlListProperty<QObject> *property, qsizetype index);
     static void data_clear(QQmlListProperty<QObject> *property);
 
     static void menus_append(QQmlListProperty<QQuickPlatformMenu> *property, QQuickPlatformMenu *menu);
-    static int menus_count(QQmlListProperty<QQuickPlatformMenu> *property);
-    static QQuickPlatformMenu *menus_at(QQmlListProperty<QQuickPlatformMenu> *property, int index);
+    static qsizetype menus_count(QQmlListProperty<QQuickPlatformMenu> *property);
+    static QQuickPlatformMenu *menus_at(QQmlListProperty<QQuickPlatformMenu> *property, qsizetype index);
     static void menus_clear(QQmlListProperty<QQuickPlatformMenu> *property);
 
 private:
diff --git a/src/imports/platform/qquickplatformmenuitemgroup.cpp b/src/imports/platform/qquickplatformmenuitemgroup.cpp
index e0773bb1..fcfcc664 100644
--- a/src/imports/platform/qquickplatformmenuitemgroup.cpp
+++ b/src/imports/platform/qquickplatformmenuitemgroup.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Labs Templates module of the Qt Toolkit.
@@ -369,13 +369,13 @@ void QQuickPlatformMenuItemGroup::items_append(QQmlListProperty<QQuickPlatformMe
     group->addItem(item);
 }
 
-int QQuickPlatformMenuItemGroup::items_count(QQmlListProperty<QQuickPlatformMenuItem> *prop)
+qsizetype QQuickPlatformMenuItemGroup::items_count(QQmlListProperty<QQuickPlatformMenuItem> *prop)
 {
     QQuickPlatformMenuItemGroup *group = static_cast<QQuickPlatformMenuItemGroup *>(prop->object);
     return group->m_items.count();
 }
 
-QQuickPlatformMenuItem *QQuickPlatformMenuItemGroup::items_at(QQmlListProperty<QQuickPlatformMenuItem> *prop, int index)
+QQuickPlatformMenuItem *QQuickPlatformMenuItemGroup::items_at(QQmlListProperty<QQuickPlatformMenuItem> *prop, qsizetype index)
 {
     QQuickPlatformMenuItemGroup *group = static_cast<QQuickPlatformMenuItemGroup *>(prop->object);
     return group->m_items.value(index);
diff --git a/src/imports/platform/qquickplatformmenuitemgroup_p.h b/src/imports/platform/qquickplatformmenuitemgroup_p.h
index 57499347..7407d266 100644
--- a/src/imports/platform/qquickplatformmenuitemgroup_p.h
+++ b/src/imports/platform/qquickplatformmenuitemgroup_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Labs Templates module of the Qt Toolkit.
@@ -105,8 +105,8 @@ private:
     void hoverItem();
 
     static void items_append(QQmlListProperty<QQuickPlatformMenuItem> *prop, QQuickPlatformMenuItem *obj);
-    static int items_count(QQmlListProperty<QQuickPlatformMenuItem> *prop);
-    static QQuickPlatformMenuItem *items_at(QQmlListProperty<QQuickPlatformMenuItem> *prop, int index);
+    static qsizetype items_count(QQmlListProperty<QQuickPlatformMenuItem> *prop);
+    static QQuickPlatformMenuItem *items_at(QQmlListProperty<QQuickPlatformMenuItem> *prop, qsizetype index);
     static void items_clear(QQmlListProperty<QQuickPlatformMenuItem> *prop);
 
     bool m_enabled;