Make QDeclarativeGeoRoute::legs type safe

We can use a QList property with a forward-declared type, so do that
instead of using QList<QObject *>.

Pick-to: 6.2
Change-Id: I20d8ebbf4aa2d9ca18ae0ce7b3e6b2698dd069f2
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/location/declarativemaps/qdeclarativegeoroute_p.h b/src/location/declarativemaps/qdeclarativegeoroute_p.h
index a43e9d4d..38a0570f 100644
--- a/src/location/declarativemaps/qdeclarativegeoroute_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroute_p.h
@@ -64,6 +64,7 @@ Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeoroutemodel_p.h>)
 
 QT_BEGIN_NAMESPACE
 class QDeclarativeGeoRouteQuery;
+class QDeclarativeGeoRouteLeg;
 
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRoute : public QObject
 {
@@ -75,7 +76,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRoute : public QObject
     Q_PROPERTY(QJSValue path READ path WRITE setPath NOTIFY pathChanged)
     Q_PROPERTY(QList<QGeoRouteSegment> segments READ segments CONSTANT)
     Q_PROPERTY(QDeclarativeGeoRouteQuery *routeQuery READ routeQuery REVISION 11)
-    Q_PROPERTY(QList<QObject *> legs READ legs CONSTANT REVISION 12)
+    Q_PROPERTY(QList<QDeclarativeGeoRouteLeg *> legs READ legs CONSTANT REVISION 12)
     Q_PROPERTY(QObject *extendedAttributes READ extendedAttributes CONSTANT REVISION 13)
 
 public:
@@ -98,7 +99,7 @@ public:
     int segmentsCount() const;
     const QGeoRoute &route() const;
     QDeclarativeGeoRouteQuery *routeQuery();
-    QList<QObject *> legs();
+    QList<QDeclarativeGeoRouteLeg *> legs();
     QQmlPropertyMap *extendedAttributes() const;
 
     Q_INVOKABLE bool equals(QDeclarativeGeoRoute *other) const;
@@ -112,7 +113,7 @@ private:
     QGeoRoute route_;
     QDeclarativeGeoRouteQuery *routeQuery_ = nullptr;
     QList<QGeoRouteSegment> segments_;
-    QList<QObject *> legs_;
+    QList<QDeclarativeGeoRouteLeg *> legs_;
     QQmlPropertyMap *m_extendedAttributes = nullptr;
 
     friend class QDeclarativeRouteMapItem;