Merge QGeoRouteLeg into QGeoRoute

QGeoRouteLeg was a subclass of QGeoRoute. Since QGeoRoute is a value
type, subclassing is problematic, even though QGeoRouteLeg had no data
of its own and only added public getters for data already carried by
QGeoRoutePrivate.

But if every leg is a route, with documentation pointing out that some
route-specific getters never return anything, then it's easier to just
add leg-specific APIs to QGeoRoute. A route is then a group of other
routes. Those route legs point back at the overall route, and know of
index within the overall route. Those leg-specific APIs return -1 for
the index and an empty overall route if the route is not a leg within
an overall route.

This saves a separate type with its own QDeclarative* wrapper, without
losing any expressiveness.

Task-number: QTBUG-105206
Change-Id: I8844290d245ed79215e6c7893d972e0da96ed197
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
index cbcda653..6e8451a1 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
@@ -131,7 +131,7 @@ private:
     QXmlStreamReader *m_reader;
 
     QList<QGeoRoute> m_results;
-    QList<QGeoRouteLeg> m_legs;
+    QList<QGeoRoute> m_legs;
     QList<QList<QGeoManeuverContainer>> m_maneuvers;
     //QList<QList<QGeoRouteSegmentContainer>> m_segments;
 };