From 8f05d1bcba8d2c63d8d85117719b49992bcaea3d Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Fri, 12 Feb 2021 15:45:28 +1000 Subject: Remove usages of deprecated QQmlListProperty constructors Change-Id: I2cc20b69fb5e7bc491f1d29a2ce6905d618ff27e Reviewed-by: David Llewellyn-Jones Reviewed-by: Matthew Vogt --- src/imports/contacts/qdeclarativecontact.cpp | 95 ++++++++-------------- src/imports/contacts/qdeclarativecontact_p.h | 4 +- src/imports/contacts/qdeclarativecontactfilter.cpp | 16 ++-- src/imports/contacts/qdeclarativecontactfilter_p.h | 4 +- src/imports/contacts/qdeclarativecontactmodel.cpp | 43 +++++----- src/imports/contacts/qdeclarativecontactmodel_p.h | 20 ++--- .../qdeclarativecontactrelationshipmodel_p.h | 7 +- .../organizer/qdeclarativeorganizeritem.cpp | 32 ++++---- .../organizer/qdeclarativeorganizeritem_p.h | 8 +- .../organizer/qdeclarativeorganizeritemdetail.cpp | 4 +- .../organizer/qdeclarativeorganizeritemdetail_p.h | 4 +- .../organizer/qdeclarativeorganizeritemfilter.cpp | 6 +- .../organizer/qdeclarativeorganizeritemfilter_p.h | 4 +- .../organizer/qdeclarativeorganizermodel.cpp | 32 ++++---- .../organizer/qdeclarativeorganizermodel_p.h | 25 +++--- 15 files changed, 142 insertions(+), 162 deletions(-) diff --git a/src/imports/contacts/qdeclarativecontact.cpp b/src/imports/contacts/qdeclarativecontact.cpp index 6968c3885..2bbd2a63c 100644 --- a/src/imports/contacts/qdeclarativecontact.cpp +++ b/src/imports/contacts/qdeclarativecontact.cpp @@ -79,12 +79,7 @@ QT_BEGIN_NAMESPACE // call-back function templates for list properties template -static void list_property_append(QQmlListProperty *, T *) -{ -} - -template -static int list_property_count(QQmlListProperty *property) +static qsizetype list_property_count(QQmlListProperty *property) { QDeclarativeContact *object = qobject_cast(property->object); if (object) @@ -94,7 +89,7 @@ static int list_property_count(QQmlListProperty *property) } template -static T *list_property_at(QQmlListProperty *property, int index) +static T *list_property_at(QQmlListProperty *property, qsizetype index) { QDeclarativeContact *object = qobject_cast(property->object); if (object) @@ -103,11 +98,6 @@ static T *list_property_at(QQmlListProperty *property, int index) return 0; } -template -static void list_property_clear(QQmlListProperty *) -{ -} - QDeclarativeContact::QDeclarativeContact(QObject *parent) :QObject(parent) , m_modified(false) @@ -383,11 +373,12 @@ void QDeclarativeContact::setCollectionId(const QString &collectionId) */ QQmlListProperty QDeclarativeContact::contactDetails() { - return QQmlListProperty(this, 0, - &QDeclarativeContact::_q_detail_append, - &QDeclarativeContact::_q_detail_count, - &QDeclarativeContact::_q_detail_at, - &QDeclarativeContact::_q_detail_clear); + return { this, + nullptr, + &QDeclarativeContact::_q_detail_append, + &QDeclarativeContact::_q_detail_count, + &QDeclarativeContact::_q_detail_at, + &QDeclarativeContact::_q_detail_clear }; } /*! @@ -497,13 +488,10 @@ QDeclarativeContactAddress* QDeclarativeContact::address() */ QQmlListProperty QDeclarativeContact::addresses() { - return QQmlListProperty( - this, - 0, - &list_property_append, - &list_property_count, - &list_property_at, - &list_property_clear); + return { this, + nullptr, + &list_property_count, + &list_property_at }; } /*! @@ -565,13 +553,10 @@ QDeclarativeContactEmailAddress* QDeclarativeContact::email() */ QQmlListProperty QDeclarativeContact::emails() { - return QQmlListProperty( - this, - 0, - &list_property_append, - &list_property_count, - &list_property_at, - &list_property_clear); + return { this, + nullptr, + &list_property_count, + &list_property_at }; } /*! @@ -592,13 +577,10 @@ QDeclarativeContactExtendedDetail* QDeclarativeContact::extendedDetail() */ QQmlListProperty QDeclarativeContact::extendedDetails() { - return QQmlListProperty( - this, - 0, - &list_property_append, - &list_property_count, - &list_property_at, - &list_property_clear); + return { this, + nullptr, + &list_property_count, + &list_property_at }; } /*! @@ -729,13 +711,10 @@ QDeclarativeContactOrganization* QDeclarativeContact::organization() */ QQmlListProperty QDeclarativeContact::organizations() { - return QQmlListProperty( - this, - 0, - &list_property_append, - &list_property_count, - &list_property_at, - &list_property_clear); + return { this, + nullptr, + &list_property_count, + &list_property_at }; } /*! @@ -756,13 +735,10 @@ QDeclarativeContactPhoneNumber* QDeclarativeContact::phoneNumber() */ QQmlListProperty QDeclarativeContact::phoneNumbers() { - return QQmlListProperty( - this, - 0, - &list_property_append, - &list_property_count, - &list_property_at, - &list_property_clear); + return { this, + nullptr, + &list_property_count, + &list_property_at }; } /*! @@ -832,13 +808,10 @@ QDeclarativeContactUrl* QDeclarativeContact::url() */ QQmlListProperty QDeclarativeContact::urls() { - return QQmlListProperty( - this, - 0, - &list_property_append, - &list_property_count, - &list_property_at, - &list_property_clear); + return { this, + nullptr, + &list_property_count, + &list_property_at }; } /*! @@ -870,7 +843,7 @@ void QDeclarativeContact::_q_detail_append(QQmlListProperty *property, int index) +QDeclarativeContactDetail *QDeclarativeContact::_q_detail_at(QQmlListProperty *property, qsizetype index) { QDeclarativeContact *object = qobject_cast(property->object); if (object) @@ -895,7 +868,7 @@ void QDeclarativeContact::_q_detail_clear(QQmlListProperty *property) +qsizetype QDeclarativeContact::_q_detail_count(QQmlListProperty *property) { QDeclarativeContact *object = qobject_cast(property->object); if (object) diff --git a/src/imports/contacts/qdeclarativecontact_p.h b/src/imports/contacts/qdeclarativecontact_p.h index b1a42a982..f020f4c88 100644 --- a/src/imports/contacts/qdeclarativecontact_p.h +++ b/src/imports/contacts/qdeclarativecontact_p.h @@ -210,9 +210,9 @@ private: // call-back functions for list property static void _q_detail_append(QQmlListProperty *property, QDeclarativeContactDetail *value); - static QDeclarativeContactDetail *_q_detail_at(QQmlListProperty *property, int index); + static QDeclarativeContactDetail *_q_detail_at(QQmlListProperty *property, qsizetype index); static void _q_detail_clear(QQmlListProperty *property); - static int _q_detail_count(QQmlListProperty *property); + static qsizetype _q_detail_count(QQmlListProperty *property); }; QT_END_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactfilter.cpp b/src/imports/contacts/qdeclarativecontactfilter.cpp index dc8006fd0..cce4b3137 100644 --- a/src/imports/contacts/qdeclarativecontactfilter.cpp +++ b/src/imports/contacts/qdeclarativecontactfilter.cpp @@ -378,12 +378,12 @@ QT_BEGIN_NAMESPACE QQmlListProperty QDeclarativeContactCompoundFilter::filters() { - return QQmlListProperty(this, - 0, // opaque data parameter - filters_append, - filters_count, - filters_at, - filters_clear); + return { this, + nullptr, // opaque data parameter + &filters_append, + &filters_count, + &filters_at, + &filters_clear }; } void QDeclarativeContactCompoundFilter::filters_append(QQmlListProperty* prop, QDeclarativeContactFilter* filter) @@ -394,13 +394,13 @@ void QDeclarativeContactCompoundFilter::filters_append(QQmlListPropertyfilterChanged(); } -int QDeclarativeContactCompoundFilter::filters_count(QQmlListProperty* prop) +qsizetype QDeclarativeContactCompoundFilter::filters_count(QQmlListProperty* prop) { // The 'prop' is in a sense 'this' for this static function (as given in filters() function) return static_cast(prop->object)->m_filters.count(); } -QDeclarativeContactFilter* QDeclarativeContactCompoundFilter::filters_at(QQmlListProperty* prop, int index) +QDeclarativeContactFilter* QDeclarativeContactCompoundFilter::filters_at(QQmlListProperty* prop, qsizetype index) { return static_cast(prop->object)->m_filters.at(index); } diff --git a/src/imports/contacts/qdeclarativecontactfilter_p.h b/src/imports/contacts/qdeclarativecontactfilter_p.h index b72690879..fe4ee26a4 100644 --- a/src/imports/contacts/qdeclarativecontactfilter_p.h +++ b/src/imports/contacts/qdeclarativecontactfilter_p.h @@ -116,8 +116,8 @@ public: QQmlListProperty filters(); static void filters_append(QQmlListProperty* prop, QDeclarativeContactFilter* filter); - static int filters_count(QQmlListProperty* prop); - static QDeclarativeContactFilter* filters_at(QQmlListProperty* prop, int index); + static qsizetype filters_count(QQmlListProperty* prop); + static QDeclarativeContactFilter* filters_at(QQmlListProperty* prop, qsizetype index); static void filters_clear(QQmlListProperty* prop); protected: diff --git a/src/imports/contacts/qdeclarativecontactmodel.cpp b/src/imports/contacts/qdeclarativecontactmodel.cpp index 24872d86c..f8677510f 100644 --- a/src/imports/contacts/qdeclarativecontactmodel.cpp +++ b/src/imports/contacts/qdeclarativecontactmodel.cpp @@ -667,12 +667,12 @@ void QDeclarativeContactModel::setFetchHint(QDeclarativeContactFetchHint* fetchH */ QQmlListProperty QDeclarativeContactModel::contacts() { - return QQmlListProperty(this, - 0, - contacts_append, - contacts_count, - contacts_at, - contacts_clear); + return { this, + nullptr, + &contacts_append, + &contacts_count, + &contacts_at, + &contacts_clear }; } @@ -684,12 +684,12 @@ void QDeclarativeContactModel::contacts_append(QQmlListProperty* prop) +qsizetype QDeclarativeContactModel::contacts_count(QQmlListProperty* prop) { return static_cast(prop->object)->d->m_contacts.count(); } -QDeclarativeContact* QDeclarativeContactModel::contacts_at(QQmlListProperty* prop, int index) +QDeclarativeContact* QDeclarativeContactModel::contacts_at(QQmlListProperty* prop, qsizetype index) { return static_cast(prop->object)->d->m_contacts.at(index); } @@ -710,12 +710,12 @@ void QDeclarativeContactModel::contacts_clear(QQmlListProperty QDeclarativeContactModel::sortOrders() { - return QQmlListProperty(this, - 0, - sortOrder_append, - sortOrder_count, - sortOrder_at, - sortOrder_clear); + return { this, + nullptr, + &sortOrder_append, + &sortOrder_count, + &sortOrder_at, + &sortOrder_clear }; } void QDeclarativeContactModel::startImport(QVersitReader::State state) @@ -1348,20 +1348,21 @@ void QDeclarativeContactModel::sortOrder_append(QQmlListProperty *p) +qsizetype QDeclarativeContactModel::sortOrder_count(QQmlListProperty *p) { QDeclarativeContactModel* model = qobject_cast(p->object); if (model) return model->d->m_sortOrders.size(); return 0; } -QDeclarativeContactSortOrder * QDeclarativeContactModel::sortOrder_at(QQmlListProperty *p, int idx) + +QDeclarativeContactSortOrder * QDeclarativeContactModel::sortOrder_at(QQmlListProperty *p, qsizetype idx) { QDeclarativeContactModel* model = qobject_cast(p->object); QDeclarativeContactSortOrder* sortOrder = 0; if (model) { - int i = 0; + qsizetype i = 0; foreach (QDeclarativeContactSortOrder* s, model->d->m_sortOrders) { if (i == idx) { sortOrder = s; @@ -1373,6 +1374,7 @@ QDeclarativeContactSortOrder * QDeclarativeContactModel::sortOrder_at(QQmlListPr } return sortOrder; } + void QDeclarativeContactModel::sortOrder_clear(QQmlListProperty *p) { QDeclarativeContactModel* model = qobject_cast(p->object); @@ -1392,16 +1394,16 @@ void QDeclarativeContactModel::sortOrder_clear(QQmlListProperty QDeclarativeContactModel::collections() { - return QQmlListProperty(this, 0, collection_count, collection_at); + return { this, nullptr, &collection_count, &collection_at }; } -int QDeclarativeContactModel::collection_count(QQmlListProperty *p) +qsizetype QDeclarativeContactModel::collection_count(QQmlListProperty *p) { QDeclarativeContactModel* model = qobject_cast(p->object); return model ? model->d->m_collections.count() : 0; } -QDeclarativeContactCollection *QDeclarativeContactModel::collection_at(QQmlListProperty *p, int idx) +QDeclarativeContactCollection *QDeclarativeContactModel::collection_at(QQmlListProperty *p, qsizetype idx) { QDeclarativeContactModel* model = qobject_cast(p->object); QDeclarativeContactCollection* collection = 0; @@ -1411,6 +1413,7 @@ QDeclarativeContactCollection *QDeclarativeContactModel::collection_at(QQmlListP } return collection; } + /*! \internal diff --git a/src/imports/contacts/qdeclarativecontactmodel_p.h b/src/imports/contacts/qdeclarativecontactmodel_p.h index 085974e55..238d27705 100644 --- a/src/imports/contacts/qdeclarativecontactmodel_p.h +++ b/src/imports/contacts/qdeclarativecontactmodel_p.h @@ -119,31 +119,31 @@ public: void setFetchHint(QDeclarativeContactFetchHint* fetchHint); // From QQmlParserStatus - virtual void classBegin() {} - virtual void componentComplete(); + void classBegin() override {} + void componentComplete() override; // From QAbstractListModel - int rowCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; bool autoUpdate() const; void setAutoUpdate(bool autoUpdate); QQmlListProperty contacts() ; static void contacts_append(QQmlListProperty* prop, QDeclarativeContact* contact); - static int contacts_count(QQmlListProperty* prop); - static QDeclarativeContact* contacts_at(QQmlListProperty* prop, int index); + static qsizetype contacts_count(QQmlListProperty* prop); + static QDeclarativeContact* contacts_at(QQmlListProperty* prop, qsizetype index); static void contacts_clear(QQmlListProperty* prop); QQmlListProperty sortOrders(); static void sortOrder_append(QQmlListProperty *p, QDeclarativeContactSortOrder *sortOrder); - static int sortOrder_count(QQmlListProperty *p); - static QDeclarativeContactSortOrder * sortOrder_at(QQmlListProperty *p, int idx); + static qsizetype sortOrder_count(QQmlListProperty *p); + static QDeclarativeContactSortOrder * sortOrder_at(QQmlListProperty *p, qsizetype idx); static void sortOrder_clear(QQmlListProperty *p); QQmlListProperty collections(); - static int collection_count(QQmlListProperty *p); - static QDeclarativeContactCollection* collection_at(QQmlListProperty *p, int idx); + static qsizetype collection_count(QQmlListProperty *p); + static QDeclarativeContactCollection* collection_at(QQmlListProperty *p, qsizetype idx); Q_INVOKABLE void removeContact(QString id); Q_INVOKABLE void removeContacts(const QStringList& ids); diff --git a/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h b/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h index 8fe470f28..0f73b5b6c 100644 --- a/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h +++ b/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h @@ -65,10 +65,13 @@ class QDeclarativeContactRelationshipModel : public QAbstractListModel public: QDeclarativeContactRelationshipModel(QObject *parent = nullptr); ~QDeclarativeContactRelationshipModel(); + enum { RelationshipRole = Qt::UserRole + 500 }; - QHash roleNames() const Q_DECL_OVERRIDE; + QHash roleNames() const override; + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; QString manager() const; void setManager(const QString& manager); @@ -85,8 +88,6 @@ public: void setRole(QDeclarativeContactRelationship::RelationshipRole role); QQmlListProperty relationships(); - int rowCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; Q_INVOKABLE void removeRelationship(QDeclarativeContactRelationship* dcr); Q_INVOKABLE void addRelationship(QDeclarativeContactRelationship* dcr); diff --git a/src/imports/organizer/qdeclarativeorganizeritem.cpp b/src/imports/organizer/qdeclarativeorganizeritem.cpp index 9afb79273..570f625b1 100644 --- a/src/imports/organizer/qdeclarativeorganizeritem.cpp +++ b/src/imports/organizer/qdeclarativeorganizeritem.cpp @@ -120,11 +120,12 @@ QDeclarativeOrganizerItemType::ItemType QDeclarativeOrganizerItem::itemType() co */ QQmlListProperty QDeclarativeOrganizerItem::itemDetails() { - return QQmlListProperty(this, 0, - &QDeclarativeOrganizerItem::_q_detail_append, - &QDeclarativeOrganizerItem::_q_detail_count, - &QDeclarativeOrganizerItem::_q_detail_at, - &QDeclarativeOrganizerItem::_q_detail_clear); + return { this, + nullptr, + &QDeclarativeOrganizerItem::_q_detail_append, + &QDeclarativeOrganizerItem::_q_detail_count, + &QDeclarativeOrganizerItem::_q_detail_at, + &QDeclarativeOrganizerItem::_q_detail_clear }; } /*! @@ -479,7 +480,7 @@ void QDeclarativeOrganizerItem::_q_detail_append(QQmlListProperty *property, int index) +QDeclarativeOrganizerItemDetail *QDeclarativeOrganizerItem::_q_detail_at(QQmlListProperty *property, qsizetype index) { QDeclarativeOrganizerItem *object = qobject_cast(property->object); if (object) @@ -504,7 +505,7 @@ void QDeclarativeOrganizerItem::_q_detail_clear(QQmlListProperty *property) +qsizetype QDeclarativeOrganizerItem::_q_detail_count(QQmlListProperty *property) { QDeclarativeOrganizerItem *object = qobject_cast(property->object); if (object) @@ -645,11 +646,12 @@ void QDeclarativeOrganizerEvent::clearDetails() */ QQmlListProperty QDeclarativeOrganizerEvent::attendees() { - return QQmlListProperty(this, 0, - &QDeclarativeOrganizerEvent::_q_attendee_append, - &QDeclarativeOrganizerEvent::_q_attendee_count, - &QDeclarativeOrganizerEvent::_q_attendee_at, - &QDeclarativeOrganizerEvent::_q_attendee_clear); + return { this, + nullptr, + &QDeclarativeOrganizerEvent::_q_attendee_append, + &QDeclarativeOrganizerEvent::_q_attendee_count, + &QDeclarativeOrganizerEvent::_q_attendee_at, + &QDeclarativeOrganizerEvent::_q_attendee_clear }; } // call-back functions for list property @@ -666,7 +668,7 @@ void QDeclarativeOrganizerEvent::_q_attendee_append(QQmlListProperty *property, int index) +QDeclarativeOrganizerEventAttendee *QDeclarativeOrganizerEvent::_q_attendee_at(QQmlListProperty *property, qsizetype index) { QDeclarativeOrganizerEvent *object = qobject_cast(property->object); QDeclarativeOrganizerEventAttendee *ret = 0; @@ -710,10 +712,10 @@ void QDeclarativeOrganizerEvent::_q_attendee_clear(QQmlListProperty *property) +qsizetype QDeclarativeOrganizerEvent::_q_attendee_count(QQmlListProperty *property) { QDeclarativeOrganizerEvent *object = qobject_cast(property->object); - int ret = 0; + qsizetype ret = 0; if (object) { foreach (QDeclarativeOrganizerItemDetail *detail, object->m_details) { if (QDeclarativeOrganizerItemDetail::EventAttendee == detail->type()) diff --git a/src/imports/organizer/qdeclarativeorganizeritem_p.h b/src/imports/organizer/qdeclarativeorganizeritem_p.h index 80ee6d209..5c85a2d05 100644 --- a/src/imports/organizer/qdeclarativeorganizeritem_p.h +++ b/src/imports/organizer/qdeclarativeorganizeritem_p.h @@ -137,9 +137,9 @@ private: // call-back functions for list property static void _q_detail_append(QQmlListProperty *property, QDeclarativeOrganizerItemDetail *value); - static QDeclarativeOrganizerItemDetail *_q_detail_at(QQmlListProperty *property, int index); + static QDeclarativeOrganizerItemDetail *_q_detail_at(QQmlListProperty *property, qsizetype index); static void _q_detail_clear(QQmlListProperty *property); - static int _q_detail_count(QQmlListProperty *property); + static qsizetype _q_detail_count(QQmlListProperty *property); }; @@ -187,9 +187,9 @@ Q_SIGNALS: private: // call-back functions for attendees list property static void _q_attendee_append(QQmlListProperty *property, QDeclarativeOrganizerEventAttendee *value); - static QDeclarativeOrganizerEventAttendee *_q_attendee_at(QQmlListProperty *property, int index); + static QDeclarativeOrganizerEventAttendee *_q_attendee_at(QQmlListProperty *property, qsizetype index); static void _q_attendee_clear(QQmlListProperty *property); - static int _q_attendee_count(QQmlListProperty *property); + static qsizetype _q_attendee_count(QQmlListProperty *property); }; diff --git a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp index f1c42ca7f..73e384f35 100644 --- a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp +++ b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp @@ -1035,12 +1035,12 @@ void QDeclarativeOrganizerItemRecurrence::xrule_append(QQmlListPropertyexceptionRulesChanged(); } -int QDeclarativeOrganizerItemRecurrence::rule_count(QQmlListProperty *p) +qsizetype QDeclarativeOrganizerItemRecurrence::rule_count(QQmlListProperty *p) { return static_cast*>(p->data)->count(); } -QDeclarativeOrganizerRecurrenceRule* QDeclarativeOrganizerItemRecurrence::rule_at(QQmlListProperty *p, int idx) +QDeclarativeOrganizerRecurrenceRule* QDeclarativeOrganizerItemRecurrence::rule_at(QQmlListProperty *p, qsizetype idx) { return static_cast*>(p->data)->at(idx); } diff --git a/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h b/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h index ffdd464a0..d3c91bcf5 100644 --- a/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h +++ b/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h @@ -399,8 +399,8 @@ private Q_SLOTS: private: static void rrule_append(QQmlListProperty *p, QDeclarativeOrganizerRecurrenceRule *item); static void xrule_append(QQmlListProperty *p, QDeclarativeOrganizerRecurrenceRule *item); - static int rule_count(QQmlListProperty *p); - static QDeclarativeOrganizerRecurrenceRule *rule_at(QQmlListProperty *p, int idx); + static qsizetype rule_count(QQmlListProperty *p); + static QDeclarativeOrganizerRecurrenceRule *rule_at(QQmlListProperty *p, qsizetype idx); static void rrule_clear(QQmlListProperty *p); static void xrule_clear(QQmlListProperty *p); diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp index c743ae854..f3470240c 100644 --- a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp +++ b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp @@ -157,7 +157,7 @@ QDeclarativeOrganizerItemCompoundFilter::~QDeclarativeOrganizerItemCompoundFilte */ QQmlListProperty QDeclarativeOrganizerItemCompoundFilter::filters() { - return QQmlListProperty(this, 0, filters_append, filters_count, filters_at, filters_clear); + return { this, nullptr, filters_append, filters_count, filters_at, filters_clear }; } /*! @@ -175,7 +175,7 @@ void QDeclarativeOrganizerItemCompoundFilter::filters_append(QQmlListProperty *prop) +qsizetype QDeclarativeOrganizerItemCompoundFilter::filters_count(QQmlListProperty *prop) { return static_cast(prop->object)->m_filters.count(); } @@ -183,7 +183,7 @@ int QDeclarativeOrganizerItemCompoundFilter::filters_count(QQmlListProperty *prop, int index) +QDeclarativeOrganizerItemFilter *QDeclarativeOrganizerItemCompoundFilter::filters_at(QQmlListProperty *prop, qsizetype index) { return static_cast(prop->object)->m_filters.at(index); } diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h b/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h index 39ff3dc3b..ea8517b57 100644 --- a/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h +++ b/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h @@ -118,8 +118,8 @@ public: QQmlListProperty filters(); static void filters_append(QQmlListProperty *prop, QDeclarativeOrganizerItemFilter *filter); - static int filters_count(QQmlListProperty *prop); - static QDeclarativeOrganizerItemFilter *filters_at(QQmlListProperty *prop, int index); + static qsizetype filters_count(QQmlListProperty *prop); + static QDeclarativeOrganizerItemFilter *filters_at(QQmlListProperty *prop, qsizetype index); static void filters_clear(QQmlListProperty *prop); Q_SIGNALS: diff --git a/src/imports/organizer/qdeclarativeorganizermodel.cpp b/src/imports/organizer/qdeclarativeorganizermodel.cpp index c2e174067..f830e7bef 100644 --- a/src/imports/organizer/qdeclarativeorganizermodel.cpp +++ b/src/imports/organizer/qdeclarativeorganizermodel.cpp @@ -744,12 +744,12 @@ QString QDeclarativeOrganizerModel::error() const */ QQmlListProperty QDeclarativeOrganizerModel::sortOrders() { - return QQmlListProperty(this, - 0, - sortOrder_append, - sortOrder_count, - sortOrder_at, - sortOrder_clear); + return { this, + nullptr, + &sortOrder_append, + &sortOrder_count, + &sortOrder_at, + &sortOrder_clear }; } void QDeclarativeOrganizerModel::startImport(QVersitReader::State state) @@ -1775,7 +1775,7 @@ QVariant QDeclarativeOrganizerModel::data(const QModelIndex &index, int role) co */ QQmlListProperty QDeclarativeOrganizerModel::items() { - return QQmlListProperty(this, 0, item_count, item_at); + return { this, nullptr, item_count, item_at }; } /*! @@ -1787,10 +1787,10 @@ QQmlListProperty QDeclarativeOrganizerModel::items() */ QQmlListProperty QDeclarativeOrganizerModel::collections() { - return QQmlListProperty(this, 0, collection_count, collection_at); + return { this, nullptr, collection_count, collection_at }; } -int QDeclarativeOrganizerModel::item_count(QQmlListProperty *p) +qsizetype QDeclarativeOrganizerModel::item_count(QQmlListProperty *p) { QDeclarativeOrganizerModel* model = qobject_cast(p->object); if (model) @@ -1798,7 +1798,7 @@ int QDeclarativeOrganizerModel::item_count(QQmlListProperty *p, int idx) +QDeclarativeOrganizerItem * QDeclarativeOrganizerModel::item_at(QQmlListProperty *p, qsizetype idx) { QDeclarativeOrganizerModel* model = qobject_cast(p->object); if (model && idx >= 0 && idx < model->d_ptr->m_items.size()) @@ -1817,20 +1817,21 @@ void QDeclarativeOrganizerModel::sortOrder_append(QQmlListProperty *p) +qsizetype QDeclarativeOrganizerModel::sortOrder_count(QQmlListProperty *p) { QDeclarativeOrganizerModel* model = qobject_cast(p->object); if (model) return model->d_ptr->m_declarativeSortOrders.size(); return 0; } -QDeclarativeOrganizerItemSortOrder * QDeclarativeOrganizerModel::sortOrder_at(QQmlListProperty *p, int idx) + +QDeclarativeOrganizerItemSortOrder * QDeclarativeOrganizerModel::sortOrder_at(QQmlListProperty *p, qsizetype idx) { QDeclarativeOrganizerModel* model = qobject_cast(p->object); QDeclarativeOrganizerItemSortOrder* sortOrder = 0; if (model) { - int i = 0; + qsizetype i = 0; foreach (QDeclarativeOrganizerItemSortOrder* s, model->d_ptr->m_declarativeSortOrders) { if (i == idx) { sortOrder = s; @@ -1842,6 +1843,7 @@ QDeclarativeOrganizerItemSortOrder * QDeclarativeOrganizerModel::sortOrder_at(QQ } return sortOrder; } + void QDeclarativeOrganizerModel::sortOrder_clear(QQmlListProperty *p) { QDeclarativeOrganizerModel* model = qobject_cast(p->object); @@ -1853,13 +1855,13 @@ void QDeclarativeOrganizerModel::sortOrder_clear(QQmlListProperty *p) +qsizetype QDeclarativeOrganizerModel::collection_count(QQmlListProperty *p) { QDeclarativeOrganizerModel* model = qobject_cast(p->object); return model ? model->d_ptr->m_collections.count() : 0; } -QDeclarativeOrganizerCollection* QDeclarativeOrganizerModel::collection_at(QQmlListProperty *p, int idx) +QDeclarativeOrganizerCollection* QDeclarativeOrganizerModel::collection_at(QQmlListProperty *p, qsizetype idx) { QDeclarativeOrganizerModel* model = qobject_cast(p->object); QDeclarativeOrganizerCollection* collection = 0; diff --git a/src/imports/organizer/qdeclarativeorganizermodel_p.h b/src/imports/organizer/qdeclarativeorganizermodel_p.h index ea50d23f1..d2e8b1996 100644 --- a/src/imports/organizer/qdeclarativeorganizermodel_p.h +++ b/src/imports/organizer/qdeclarativeorganizermodel_p.h @@ -108,8 +108,6 @@ public: explicit QDeclarativeOrganizerModel(QOrganizerManager* manager, const QDateTime& start, const QDateTime& end, QObject *parent = nullptr); ~QDeclarativeOrganizerModel(); - QHash roleNames() const Q_DECL_OVERRIDE; - QString error() const; int itemCount() const; @@ -124,11 +122,12 @@ public: void setEndPeriod(const QDateTime& end); // From QQmlParserStatus - virtual void classBegin() {} - virtual void componentComplete(); + void classBegin() override {} + void componentComplete() override; - int rowCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; + QHash roleNames() const override; + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; QDeclarativeOrganizerItemFilter* filter() const; @@ -224,16 +223,16 @@ private: QDeclarativeOrganizerItem* createItem(const QOrganizerItem& item); void checkError(const QOrganizerAbstractRequest *request); - static int item_count(QQmlListProperty *p); - static QDeclarativeOrganizerItem * item_at(QQmlListProperty *p, int idx); + static qsizetype item_count(QQmlListProperty *p); + static QDeclarativeOrganizerItem * item_at(QQmlListProperty *p, qsizetype idx); static void sortOrder_append(QQmlListProperty *p, QDeclarativeOrganizerItemSortOrder *sortOrder); - static int sortOrder_count(QQmlListProperty *p); - static QDeclarativeOrganizerItemSortOrder * sortOrder_at(QQmlListProperty *p, int idx); - static void sortOrder_clear(QQmlListProperty *p); + static qsizetype sortOrder_count(QQmlListProperty *p); + static QDeclarativeOrganizerItemSortOrder * sortOrder_at(QQmlListProperty *p, qsizetype idx); + static void sortOrder_clear(QQmlListProperty *p); - static int collection_count(QQmlListProperty *p); - static QDeclarativeOrganizerCollection* collection_at(QQmlListProperty *p, int idx); + static qsizetype collection_count(QQmlListProperty *p); + static QDeclarativeOrganizerCollection* collection_at(QQmlListProperty *p, qsizetype idx); QScopedPointer d_ptr; Q_DECLARE_PRIVATE(QDeclarativeOrganizerModel) -- cgit v1.2.3