diff options
| author | Chris Adams <chris.adams@qinetic.com.au> | 2021-02-12 15:45:28 +1000 |
|---|---|---|
| committer | Chris Adams <chris.adams@qinetic.com.au> | 2021-03-18 10:14:45 +1000 |
| commit | 8f05d1bcba8d2c63d8d85117719b49992bcaea3d (patch) | |
| tree | 35ee5c66cdd35a0dca2fddf6a39b284be76fef74 /src/imports/organizer/qdeclarativeorganizeritem.cpp | |
| parent | b2b00dcee5470bcc2cd22d7cb1a392198d331cf6 (diff) | |
Remove usages of deprecated QQmlListProperty constructors
Change-Id: I2cc20b69fb5e7bc491f1d29a2ce6905d618ff27e
Reviewed-by: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Diffstat (limited to 'src/imports/organizer/qdeclarativeorganizeritem.cpp')
| -rw-r--r-- | src/imports/organizer/qdeclarativeorganizeritem.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
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<QDeclarativeOrganizerItemDetail> QDeclarativeOrganizerItem::itemDetails() { - return QQmlListProperty<QDeclarativeOrganizerItemDetail>(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<QDeclarativeOr /*! \internal */ -QDeclarativeOrganizerItemDetail *QDeclarativeOrganizerItem::_q_detail_at(QQmlListProperty<QDeclarativeOrganizerItemDetail> *property, int index) +QDeclarativeOrganizerItemDetail *QDeclarativeOrganizerItem::_q_detail_at(QQmlListProperty<QDeclarativeOrganizerItemDetail> *property, qsizetype index) { QDeclarativeOrganizerItem *object = qobject_cast<QDeclarativeOrganizerItem *>(property->object); if (object) @@ -504,7 +505,7 @@ void QDeclarativeOrganizerItem::_q_detail_clear(QQmlListProperty<QDeclarativeOrg /*! \internal */ -int QDeclarativeOrganizerItem::_q_detail_count(QQmlListProperty<QDeclarativeOrganizerItemDetail> *property) +qsizetype QDeclarativeOrganizerItem::_q_detail_count(QQmlListProperty<QDeclarativeOrganizerItemDetail> *property) { QDeclarativeOrganizerItem *object = qobject_cast<QDeclarativeOrganizerItem *>(property->object); if (object) @@ -645,11 +646,12 @@ void QDeclarativeOrganizerEvent::clearDetails() */ QQmlListProperty<QDeclarativeOrganizerEventAttendee> QDeclarativeOrganizerEvent::attendees() { - return QQmlListProperty<QDeclarativeOrganizerEventAttendee>(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<QDeclarativ /*! \internal */ -QDeclarativeOrganizerEventAttendee *QDeclarativeOrganizerEvent::_q_attendee_at(QQmlListProperty<QDeclarativeOrganizerEventAttendee> *property, int index) +QDeclarativeOrganizerEventAttendee *QDeclarativeOrganizerEvent::_q_attendee_at(QQmlListProperty<QDeclarativeOrganizerEventAttendee> *property, qsizetype index) { QDeclarativeOrganizerEvent *object = qobject_cast<QDeclarativeOrganizerEvent *>(property->object); QDeclarativeOrganizerEventAttendee *ret = 0; @@ -710,10 +712,10 @@ void QDeclarativeOrganizerEvent::_q_attendee_clear(QQmlListProperty<QDeclarative /*! \internal */ -int QDeclarativeOrganizerEvent::_q_attendee_count(QQmlListProperty<QDeclarativeOrganizerEventAttendee> *property) +qsizetype QDeclarativeOrganizerEvent::_q_attendee_count(QQmlListProperty<QDeclarativeOrganizerEventAttendee> *property) { QDeclarativeOrganizerEvent *object = qobject_cast<QDeclarativeOrganizerEvent *>(property->object); - int ret = 0; + qsizetype ret = 0; if (object) { foreach (QDeclarativeOrganizerItemDetail *detail, object->m_details) { if (QDeclarativeOrganizerItemDetail::EventAttendee == detail->type()) |