From b207f90c3074ef27b10c17cc719d83076bb3d78c Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 10 Nov 2020 11:42:25 +0100 Subject: 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 --- src/quicktemplates2/qquickactiongroup.cpp | 10 +++++----- src/quicktemplates2/qquickbuttongroup.cpp | 10 +++++----- src/quicktemplates2/qquickcontainer.cpp | 10 +++++----- src/quicktemplates2/qquickcontainer_p_p.h | 12 ++++++------ src/quicktemplates2/qquickmenu.cpp | 6 +++--- src/quicktemplates2/qquickmenu_p_p.h | 6 +++--- src/quicktemplates2/qquickmenubar.cpp | 6 +++--- src/quicktemplates2/qquickmenubar_p_p.h | 6 +++--- src/quicktemplates2/qquickscrollview.cpp | 18 +++++++++--------- 9 files changed, 42 insertions(+), 42 deletions(-) (limited to 'src/quicktemplates2') diff --git a/src/quicktemplates2/qquickactiongroup.cpp b/src/quicktemplates2/qquickactiongroup.cpp index 301957b6..4f621af7 100644 --- a/src/quicktemplates2/qquickactiongroup.cpp +++ b/src/quicktemplates2/qquickactiongroup.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 Quick Templates 2 module of the Qt Toolkit. @@ -149,8 +149,8 @@ public: static bool changeEnabled(QQuickAction *action, bool enabled); static void actions_append(QQmlListProperty *prop, QQuickAction *obj); - static int actions_count(QQmlListProperty *prop); - static QQuickAction *actions_at(QQmlListProperty *prop, int index); + static qsizetype actions_count(QQmlListProperty *prop); + static QQuickAction *actions_at(QQmlListProperty *prop, qsizetype index); static void actions_clear(QQmlListProperty *prop); bool enabled = true; @@ -200,13 +200,13 @@ void QQuickActionGroupPrivate::actions_append(QQmlListProperty *pr q->addAction(obj); } -int QQuickActionGroupPrivate::actions_count(QQmlListProperty *prop) +qsizetype QQuickActionGroupPrivate::actions_count(QQmlListProperty *prop) { QQuickActionGroupPrivate *p = static_cast(prop->data); return p->actions.count(); } -QQuickAction *QQuickActionGroupPrivate::actions_at(QQmlListProperty *prop, int index) +QQuickAction *QQuickActionGroupPrivate::actions_at(QQmlListProperty *prop, qsizetype index) { QQuickActionGroupPrivate *p = static_cast(prop->data); return p->actions.value(index); diff --git a/src/quicktemplates2/qquickbuttongroup.cpp b/src/quicktemplates2/qquickbuttongroup.cpp index 974cd029..3788d7c0 100644 --- a/src/quicktemplates2/qquickbuttongroup.cpp +++ b/src/quicktemplates2/qquickbuttongroup.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 Quick Templates 2 module of the Qt Toolkit. @@ -161,8 +161,8 @@ public: void setCheckState(Qt::CheckState state); static void buttons_append(QQmlListProperty *prop, QQuickAbstractButton *obj); - static int buttons_count(QQmlListProperty *prop); - static QQuickAbstractButton *buttons_at(QQmlListProperty *prop, int index); + static qsizetype buttons_count(QQmlListProperty *prop); + static QQuickAbstractButton *buttons_at(QQmlListProperty *prop, qsizetype index); static void buttons_clear(QQmlListProperty *prop); bool complete = true; @@ -235,13 +235,13 @@ void QQuickButtonGroupPrivate::buttons_append(QQmlListPropertyaddButton(obj); } -int QQuickButtonGroupPrivate::buttons_count(QQmlListProperty *prop) +qsizetype QQuickButtonGroupPrivate::buttons_count(QQmlListProperty *prop) { QQuickButtonGroupPrivate *p = static_cast(prop->data); return p->buttons.count(); } -QQuickAbstractButton *QQuickButtonGroupPrivate::buttons_at(QQmlListProperty *prop, int index) +QQuickAbstractButton *QQuickButtonGroupPrivate::buttons_at(QQmlListProperty *prop, qsizetype index) { QQuickButtonGroupPrivate *p = static_cast(prop->data); return p->buttons.value(index); diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index 505ac321..3148bdee 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.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 Quick Templates 2 module of the Qt Toolkit. @@ -391,13 +391,13 @@ void QQuickContainerPrivate::contentData_append(QQmlListProperty *prop, } } -int QQuickContainerPrivate::contentData_count(QQmlListProperty *prop) +qsizetype QQuickContainerPrivate::contentData_count(QQmlListProperty *prop) { QQuickContainer *q = static_cast(prop->object); return QQuickContainerPrivate::get(q)->contentData.count(); } -QObject *QQuickContainerPrivate::contentData_at(QQmlListProperty *prop, int index) +QObject *QQuickContainerPrivate::contentData_at(QQmlListProperty *prop, qsizetype index) { QQuickContainer *q = static_cast(prop->object); return QQuickContainerPrivate::get(q)->contentData.value(index); @@ -415,13 +415,13 @@ void QQuickContainerPrivate::contentChildren_append(QQmlListProperty q->addItem(item); } -int QQuickContainerPrivate::contentChildren_count(QQmlListProperty *prop) +qsizetype QQuickContainerPrivate::contentChildren_count(QQmlListProperty *prop) { QQuickContainer *q = static_cast(prop->object); return QQuickContainerPrivate::get(q)->contentModel->count(); } -QQuickItem *QQuickContainerPrivate::contentChildren_at(QQmlListProperty *prop, int index) +QQuickItem *QQuickContainerPrivate::contentChildren_at(QQmlListProperty *prop, qsizetype index) { QQuickContainer *q = static_cast(prop->object); return q->itemAt(index); diff --git a/src/quicktemplates2/qquickcontainer_p_p.h b/src/quicktemplates2/qquickcontainer_p_p.h index 1a251b50..b9f8eb0f 100644 --- a/src/quicktemplates2/qquickcontainer_p_p.h +++ b/src/quicktemplates2/qquickcontainer_p_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 Quick Templates 2 module of the Qt Toolkit. @@ -81,13 +81,13 @@ public: void itemDestroyed(QQuickItem *item) override; static void contentData_append(QQmlListProperty *prop, QObject *obj); - static int contentData_count(QQmlListProperty *prop); - static QObject *contentData_at(QQmlListProperty *prop, int index); + static qsizetype contentData_count(QQmlListProperty *prop); + static QObject *contentData_at(QQmlListProperty *prop, qsizetype index); static void contentData_clear(QQmlListProperty *prop); static void contentChildren_append(QQmlListProperty *prop, QQuickItem *obj); - static int contentChildren_count(QQmlListProperty *prop); - static QQuickItem *contentChildren_at(QQmlListProperty *prop, int index); + static qsizetype contentChildren_count(QQmlListProperty *prop); + static QQuickItem *contentChildren_at(QQmlListProperty *prop, qsizetype index); static void contentChildren_clear(QQmlListProperty *prop); void updateContentWidth(); @@ -99,7 +99,7 @@ public: qreal contentHeight = 0; QObjectList contentData; QQmlObjectModel *contentModel = nullptr; - int currentIndex = -1; + qsizetype currentIndex = -1; bool updatingCurrent = false; QQuickItemPrivate::ChangeTypes changeTypes = Destroyed | Parent | SiblingOrder; }; diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index b471a3fc..d9231cbd 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.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 Quick Templates 2 module of the Qt Toolkit. @@ -703,13 +703,13 @@ void QQuickMenuPrivate::contentData_append(QQmlListProperty *prop, QObj } } -int QQuickMenuPrivate::contentData_count(QQmlListProperty *prop) +qsizetype QQuickMenuPrivate::contentData_count(QQmlListProperty *prop) { QQuickMenu *q = static_cast(prop->object); return QQuickMenuPrivate::get(q)->contentData.count(); } -QObject *QQuickMenuPrivate::contentData_at(QQmlListProperty *prop, int index) +QObject *QQuickMenuPrivate::contentData_at(QQmlListProperty *prop, qsizetype index) { QQuickMenu *q = static_cast(prop->object); return QQuickMenuPrivate::get(q)->contentData.value(index); diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h index 23b4444c..86701d9b 100644 --- a/src/quicktemplates2/qquickmenu_p_p.h +++ b/src/quicktemplates2/qquickmenu_p_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 Quick Templates 2 module of the Qt Toolkit. @@ -120,8 +120,8 @@ public: QQuickMenuItem *firstEnabledMenuItem() const; static void contentData_append(QQmlListProperty *prop, QObject *obj); - static int contentData_count(QQmlListProperty *prop); - static QObject *contentData_at(QQmlListProperty *prop, int index); + static qsizetype contentData_count(QQmlListProperty *prop); + static QObject *contentData_at(QQmlListProperty *prop, qsizetype index); static void contentData_clear(QQmlListProperty *prop); QPalette defaultPalette() const override; diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates2/qquickmenubar.cpp index b4384aef..b5731158 100644 --- a/src/quicktemplates2/qquickmenubar.cpp +++ b/src/quicktemplates2/qquickmenubar.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 Quick Templates 2 module of the Qt Toolkit. @@ -265,13 +265,13 @@ void QQuickMenuBarPrivate::menus_append(QQmlListProperty *prop, QQui menuBar->addMenu(obj); } -int QQuickMenuBarPrivate::menus_count(QQmlListProperty *prop) +qsizetype QQuickMenuBarPrivate::menus_count(QQmlListProperty *prop) { QQuickMenuBar *menuBar = static_cast(prop->object); return menuBar->count(); } -QQuickMenu *QQuickMenuBarPrivate::menus_at(QQmlListProperty *prop, int index) +QQuickMenu *QQuickMenuBarPrivate::menus_at(QQmlListProperty *prop, qsizetype index) { QQuickMenuBar *menuBar = static_cast(prop->object); return menuBar->menuAt(index); diff --git a/src/quicktemplates2/qquickmenubar_p_p.h b/src/quicktemplates2/qquickmenubar_p_p.h index 45a6056a..0562d7e5 100644 --- a/src/quicktemplates2/qquickmenubar_p_p.h +++ b/src/quicktemplates2/qquickmenubar_p_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 Quick Templates 2 module of the Qt Toolkit. @@ -92,8 +92,8 @@ public: static void contentData_append(QQmlListProperty *prop, QObject *obj); static void menus_append(QQmlListProperty *prop, QQuickMenu *obj); - static int menus_count(QQmlListProperty *prop); - static QQuickMenu *menus_at(QQmlListProperty *prop, int index); + static qsizetype menus_count(QQmlListProperty *prop); + static QQuickMenu *menus_at(QQmlListProperty *prop, qsizetype index); static void menus_clear(QQmlListProperty *prop); QPalette defaultPalette() const override; diff --git a/src/quicktemplates2/qquickscrollview.cpp b/src/quicktemplates2/qquickscrollview.cpp index fd936d16..ae2b52d6 100644 --- a/src/quicktemplates2/qquickscrollview.cpp +++ b/src/quicktemplates2/qquickscrollview.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 Quick Templates 2 module of the Qt Toolkit. @@ -149,13 +149,13 @@ public: void setScrollBarsInteractive(bool interactive); static void contentData_append(QQmlListProperty *prop, QObject *obj); - static int contentData_count(QQmlListProperty *prop); - static QObject *contentData_at(QQmlListProperty *prop, int index); + static qsizetype contentData_count(QQmlListProperty *prop); + static QObject *contentData_at(QQmlListProperty *prop, qsizetype index); static void contentData_clear(QQmlListProperty *prop); static void contentChildren_append(QQmlListProperty *prop, QQuickItem *obj); - static int contentChildren_count(QQmlListProperty *prop); - static QQuickItem *contentChildren_at(QQmlListProperty *prop, int index); + static qsizetype contentChildren_count(QQmlListProperty *prop); + static QQuickItem *contentChildren_at(QQmlListProperty *prop, qsizetype index); static void contentChildren_clear(QQmlListProperty *prop); void itemImplicitWidthChanged(QQuickItem *item) override; @@ -346,7 +346,7 @@ void QQuickScrollViewPrivate::contentData_append(QQmlListProperty *prop data.append(&data, obj); } -int QQuickScrollViewPrivate::contentData_count(QQmlListProperty *prop) +qsizetype QQuickScrollViewPrivate::contentData_count(QQmlListProperty *prop) { QQuickScrollViewPrivate *p = static_cast(prop->data); if (!p->flickable) @@ -356,7 +356,7 @@ int QQuickScrollViewPrivate::contentData_count(QQmlListProperty *prop) return data.count(&data); } -QObject *QQuickScrollViewPrivate::contentData_at(QQmlListProperty *prop, int index) +QObject *QQuickScrollViewPrivate::contentData_at(QQmlListProperty *prop, qsizetype index) { QQuickScrollViewPrivate *p = static_cast(prop->data); if (!p->flickable) @@ -388,7 +388,7 @@ void QQuickScrollViewPrivate::contentChildren_append(QQmlListProperty *prop) +qsizetype QQuickScrollViewPrivate::contentChildren_count(QQmlListProperty *prop) { QQuickScrollViewPrivate *p = static_cast(prop->data); if (!p->flickable) @@ -398,7 +398,7 @@ int QQuickScrollViewPrivate::contentChildren_count(QQmlListProperty return children.count(&children); } -QQuickItem *QQuickScrollViewPrivate::contentChildren_at(QQmlListProperty *prop, int index) +QQuickItem *QQuickScrollViewPrivate::contentChildren_at(QQmlListProperty *prop, qsizetype index) { QQuickScrollViewPrivate *p = static_cast(prop->data); if (!p->flickable) -- cgit v1.2.3