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/imports/platform/qquickplatformmenu.cpp | 10 +++++----- src/imports/platform/qquickplatformmenu_p.h | 10 +++++----- src/imports/platform/qquickplatformmenubar.cpp | 10 +++++----- src/imports/platform/qquickplatformmenubar_p.h | 10 +++++----- src/imports/platform/qquickplatformmenuitemgroup.cpp | 6 +++--- src/imports/platform/qquickplatformmenuitemgroup_p.h | 6 +++--- 6 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/imports/platform') 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 *property, QObjec menu->m_data.append(object); } -int QQuickPlatformMenu::data_count(QQmlListProperty *property) +qsizetype QQuickPlatformMenu::data_count(QQmlListProperty *property) { QQuickPlatformMenu *menu = static_cast(property->object); return menu->m_data.count(); } -QObject *QQuickPlatformMenu::data_at(QQmlListProperty *property, int index) +QObject *QQuickPlatformMenu::data_at(QQmlListProperty *property, qsizetype index) { QQuickPlatformMenu *menu = static_cast(property->object); return menu->m_data.value(index); @@ -863,13 +863,13 @@ void QQuickPlatformMenu::items_append(QQmlListProperty * menu->addItem(item); } -int QQuickPlatformMenu::items_count(QQmlListProperty *property) +qsizetype QQuickPlatformMenu::items_count(QQmlListProperty *property) { QQuickPlatformMenu *menu = static_cast(property->object); return menu->m_items.count(); } -QQuickPlatformMenuItem *QQuickPlatformMenu::items_at(QQmlListProperty *property, int index) +QQuickPlatformMenuItem *QQuickPlatformMenu::items_at(QQmlListProperty *property, qsizetype index) { QQuickPlatformMenu *menu = static_cast(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 *property, QObject *object); - static int data_count(QQmlListProperty *property); - static QObject *data_at(QQmlListProperty *property, int index); + static qsizetype data_count(QQmlListProperty *property); + static QObject *data_at(QQmlListProperty *property, qsizetype index); static void data_clear(QQmlListProperty *property); static void items_append(QQmlListProperty *property, QQuickPlatformMenuItem *item); - static int items_count(QQmlListProperty *property); - static QQuickPlatformMenuItem *items_at(QQmlListProperty *property, int index); + static qsizetype items_count(QQmlListProperty *property); + static QQuickPlatformMenuItem *items_at(QQmlListProperty *property, qsizetype index); static void items_clear(QQmlListProperty *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 *property, QOb menuBar->m_data.append(object); } -int QQuickPlatformMenuBar::data_count(QQmlListProperty *property) +qsizetype QQuickPlatformMenuBar::data_count(QQmlListProperty *property) { QQuickPlatformMenuBar *menuBar = static_cast(property->object); return menuBar->m_data.count(); } -QObject *QQuickPlatformMenuBar::data_at(QQmlListProperty *property, int index) +QObject *QQuickPlatformMenuBar::data_at(QQmlListProperty *property, qsizetype index) { QQuickPlatformMenuBar *menuBar = static_cast(property->object); return menuBar->m_data.value(index); @@ -310,13 +310,13 @@ void QQuickPlatformMenuBar::menus_append(QQmlListProperty *p menuBar->addMenu(menu); } -int QQuickPlatformMenuBar::menus_count(QQmlListProperty *property) +qsizetype QQuickPlatformMenuBar::menus_count(QQmlListProperty *property) { QQuickPlatformMenuBar *menuBar = static_cast(property->object); return menuBar->m_menus.count(); } -QQuickPlatformMenu *QQuickPlatformMenuBar::menus_at(QQmlListProperty *property, int index) +QQuickPlatformMenu *QQuickPlatformMenuBar::menus_at(QQmlListProperty *property, qsizetype index) { QQuickPlatformMenuBar *menuBar = static_cast(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 *property, QObject *object); - static int data_count(QQmlListProperty *property); - static QObject *data_at(QQmlListProperty *property, int index); + static qsizetype data_count(QQmlListProperty *property); + static QObject *data_at(QQmlListProperty *property, qsizetype index); static void data_clear(QQmlListProperty *property); static void menus_append(QQmlListProperty *property, QQuickPlatformMenu *menu); - static int menus_count(QQmlListProperty *property); - static QQuickPlatformMenu *menus_at(QQmlListProperty *property, int index); + static qsizetype menus_count(QQmlListProperty *property); + static QQuickPlatformMenu *menus_at(QQmlListProperty *property, qsizetype index); static void menus_clear(QQmlListProperty *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(QQmlListPropertyaddItem(item); } -int QQuickPlatformMenuItemGroup::items_count(QQmlListProperty *prop) +qsizetype QQuickPlatformMenuItemGroup::items_count(QQmlListProperty *prop) { QQuickPlatformMenuItemGroup *group = static_cast(prop->object); return group->m_items.count(); } -QQuickPlatformMenuItem *QQuickPlatformMenuItemGroup::items_at(QQmlListProperty *prop, int index) +QQuickPlatformMenuItem *QQuickPlatformMenuItemGroup::items_at(QQmlListProperty *prop, qsizetype index) { QQuickPlatformMenuItemGroup *group = static_cast(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 *prop, QQuickPlatformMenuItem *obj); - static int items_count(QQmlListProperty *prop); - static QQuickPlatformMenuItem *items_at(QQmlListProperty *prop, int index); + static qsizetype items_count(QQmlListProperty *prop); + static QQuickPlatformMenuItem *items_at(QQmlListProperty *prop, qsizetype index); static void items_clear(QQmlListProperty *prop); bool m_enabled; -- cgit v1.2.3