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/contacts/qdeclarativecontactfilter.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/contacts/qdeclarativecontactfilter.cpp')
-rw-r--r-- | src/imports/contacts/qdeclarativecontactfilter.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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<QDeclarativeContactFilter> QDeclarativeContactCompoundFilter::filters() { - return QQmlListProperty<QDeclarativeContactFilter>(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<QDeclarativeContactFilter>* prop, QDeclarativeContactFilter* filter) @@ -394,13 +394,13 @@ void QDeclarativeContactCompoundFilter::filters_append(QQmlListProperty<QDeclara emit compoundFilter->filterChanged(); } -int QDeclarativeContactCompoundFilter::filters_count(QQmlListProperty<QDeclarativeContactFilter>* prop) +qsizetype QDeclarativeContactCompoundFilter::filters_count(QQmlListProperty<QDeclarativeContactFilter>* prop) { // The 'prop' is in a sense 'this' for this static function (as given in filters() function) return static_cast<QDeclarativeContactCompoundFilter*>(prop->object)->m_filters.count(); } -QDeclarativeContactFilter* QDeclarativeContactCompoundFilter::filters_at(QQmlListProperty<QDeclarativeContactFilter>* prop, int index) +QDeclarativeContactFilter* QDeclarativeContactCompoundFilter::filters_at(QQmlListProperty<QDeclarativeContactFilter>* prop, qsizetype index) { return static_cast<QDeclarativeContactCompoundFilter*>(prop->object)->m_filters.at(index); } |