diff options
Diffstat (limited to 'src/location/declarativemaps')
8 files changed, 20 insertions, 20 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeoroute.cpp b/src/location/declarativemaps/qdeclarativegeoroute.cpp index 0144ade9..92f6b0b0 100644 --- a/src/location/declarativemaps/qdeclarativegeoroute.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroute.cpp @@ -254,7 +254,7 @@ void QDeclarativeGeoRoute::segments_append(QQmlListProperty<QDeclarativeGeoRoute /*! \internal */ -int QDeclarativeGeoRoute::segments_count(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop) +qsizetype QDeclarativeGeoRoute::segments_count(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop) { QDeclarativeGeoRoute *declRoute = static_cast<QDeclarativeGeoRoute *>(prop->object); return declRoute->segmentsCount(); @@ -263,7 +263,7 @@ int QDeclarativeGeoRoute::segments_count(QQmlListProperty<QDeclarativeGeoRouteSe /*! \internal */ -QDeclarativeGeoRouteSegment *QDeclarativeGeoRoute::segments_at(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, int index) +QDeclarativeGeoRouteSegment *QDeclarativeGeoRoute::segments_at(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, qsizetype index) { QDeclarativeGeoRoute *declRoute = static_cast<QDeclarativeGeoRoute *>(prop->object); declRoute->initSegments(index); // init only what's needed. diff --git a/src/location/declarativemaps/qdeclarativegeoroute_p.h b/src/location/declarativemaps/qdeclarativegeoroute_p.h index 9d89760a..49b2f984 100644 --- a/src/location/declarativemaps/qdeclarativegeoroute_p.h +++ b/src/location/declarativemaps/qdeclarativegeoroute_p.h @@ -103,8 +103,8 @@ Q_SIGNALS: private: static void segments_append(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, QDeclarativeGeoRouteSegment *segment); - static int segments_count(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop); - static QDeclarativeGeoRouteSegment *segments_at(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, int index); + static qsizetype segments_count(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop); + static QDeclarativeGeoRouteSegment *segments_at(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, qsizetype index); static void segments_clear(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop); void initSegments(unsigned int lastIndex = ~0U); diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp index a3a7fe85..5bad5b71 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp @@ -1586,12 +1586,12 @@ void QDeclarativeGeoRouteQuery::append(QQmlListProperty<QObject> *p, QObject *v) } } -int QDeclarativeGeoRouteQuery::count(QQmlListProperty<QObject> *p) +qsizetype QDeclarativeGeoRouteQuery::count(QQmlListProperty<QObject> *p) { return static_cast<QDeclarativeGeoRouteQuery*>(p->object)->m_children.count(); } -QObject *QDeclarativeGeoRouteQuery::at(QQmlListProperty<QObject> *p, int idx) +QObject *QDeclarativeGeoRouteQuery::at(QQmlListProperty<QObject> *p, qsizetype idx) { return static_cast<QDeclarativeGeoRouteQuery*>(p->object)->m_children.at(idx); } @@ -1908,12 +1908,12 @@ void QDeclarativeGeoWaypoint::append(QQmlListProperty<QObject> *p, QObject *v) } } -int QDeclarativeGeoWaypoint::count(QQmlListProperty<QObject> *p) +qsizetype QDeclarativeGeoWaypoint::count(QQmlListProperty<QObject> *p) { return static_cast<QDeclarativeGeoWaypoint*>(p->object)->m_children.count(); } -QObject *QDeclarativeGeoWaypoint::at(QQmlListProperty<QObject> *p, int idx) +QObject *QDeclarativeGeoWaypoint::at(QQmlListProperty<QObject> *p, qsizetype idx) { return static_cast<QDeclarativeGeoWaypoint*>(p->object)->m_children.at(idx); } diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h index d5286cf7..b6405b16 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h +++ b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h @@ -256,8 +256,8 @@ protected: // For quickChildren static void append(QQmlListProperty<QObject> *p, QObject *v); - static int count(QQmlListProperty<QObject> *p); - static QObject *at(QQmlListProperty<QObject> *p, int idx); + static qsizetype count(QQmlListProperty<QObject> *p); + static QObject *at(QQmlListProperty<QObject> *p, qsizetype idx); static void clear(QQmlListProperty<QObject> *p); QQmlListProperty<QObject> declarativeChildren(); QList<QObject*> m_children; @@ -448,8 +448,8 @@ private Q_SLOTS: protected: static void append(QQmlListProperty<QObject> *p, QObject *v); - static int count(QQmlListProperty<QObject> *p); - static QObject *at(QQmlListProperty<QObject> *p, int idx); + static qsizetype count(QQmlListProperty<QObject> *p); + static QObject *at(QQmlListProperty<QObject> *p, qsizetype idx); static void clear(QQmlListProperty<QObject> *p); QQmlListProperty<QObject> declarativeChildren(); diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp index a455cc09..19810765 100644 --- a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp +++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp @@ -628,7 +628,7 @@ void QDeclarativeGeoServiceProvider::parameter_append(QQmlListProperty<QDeclarat /*! \internal */ -int QDeclarativeGeoServiceProvider::parameter_count(QQmlListProperty<QDeclarativePluginParameter> *prop) +qsizetype QDeclarativeGeoServiceProvider::parameter_count(QQmlListProperty<QDeclarativePluginParameter> *prop) { return static_cast<QDeclarativeGeoServiceProvider *>(prop->object)->parameters_.count(); } @@ -636,7 +636,7 @@ int QDeclarativeGeoServiceProvider::parameter_count(QQmlListProperty<QDeclarativ /*! \internal */ -QDeclarativePluginParameter *QDeclarativeGeoServiceProvider::parameter_at(QQmlListProperty<QDeclarativePluginParameter> *prop, int index) +QDeclarativePluginParameter *QDeclarativeGeoServiceProvider::parameter_at(QQmlListProperty<QDeclarativePluginParameter> *prop, qsizetype index) { return static_cast<QDeclarativeGeoServiceProvider *>(prop->object)->parameters_[index]; } diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h index 6c1b0f63..dcda55a1 100644 --- a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h +++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h @@ -199,8 +199,8 @@ private: bool parametersReady(); void tryAttach(); static void parameter_append(QQmlListProperty<QDeclarativePluginParameter> *prop, QDeclarativePluginParameter *mapObject); - static int parameter_count(QQmlListProperty<QDeclarativePluginParameter> *prop); - static QDeclarativePluginParameter *parameter_at(QQmlListProperty<QDeclarativePluginParameter> *prop, int index); + static qsizetype parameter_count(QQmlListProperty<QDeclarativePluginParameter> *prop); + static QDeclarativePluginParameter *parameter_at(QQmlListProperty<QDeclarativePluginParameter> *prop, qsizetype index); static void parameter_clear(QQmlListProperty<QDeclarativePluginParameter> *prop); QGeoServiceProvider *sharedProvider_; diff --git a/src/location/declarativemaps/qparameterizableobject.cpp b/src/location/declarativemaps/qparameterizableobject.cpp index b1e588e6..6c87819a 100644 --- a/src/location/declarativemaps/qparameterizableobject.cpp +++ b/src/location/declarativemaps/qparameterizableobject.cpp @@ -66,12 +66,12 @@ void QParameterizableObject::append(QQmlListProperty<QObject> *p, QObject *v) object->appendChild(v); } -int QParameterizableObject::count(QQmlListProperty<QObject> *p) +qsizetype QParameterizableObject::count(QQmlListProperty<QObject> *p) { return static_cast<QParameterizableObject*>(p->object)->m_children.count(); } -QObject *QParameterizableObject::at(QQmlListProperty<QObject> *p, int idx) +QObject *QParameterizableObject::at(QQmlListProperty<QObject> *p, qsizetype idx) { return static_cast<QParameterizableObject*>(p->object)->m_children.at(idx); } diff --git a/src/location/declarativemaps/qparameterizableobject_p.h b/src/location/declarativemaps/qparameterizableobject_p.h index 21a096e0..b0fd3132 100644 --- a/src/location/declarativemaps/qparameterizableobject_p.h +++ b/src/location/declarativemaps/qparameterizableobject_p.h @@ -87,8 +87,8 @@ protected: virtual void clearChildren(); static void append(QQmlListProperty<QObject> *p, QObject *v); - static int count(QQmlListProperty<QObject> *p); - static QObject *at(QQmlListProperty<QObject> *p, int idx); + static qsizetype count(QQmlListProperty<QObject> *p); + static QObject *at(QQmlListProperty<QObject> *p, qsizetype idx); static void clear(QQmlListProperty<QObject> *p); QQmlListProperty<QObject> declarativeChildren(); |