Register QGeoRoute as QML value type, remove QDeclarativeGeoRoute

Adapt model and tests accordingly.

Fixes: QTBUG-106482
Change-Id: Ie5a36e4fef17ae7bc4ecfab9187a325fb025e283
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 0 insertions, 298 deletions

diff --git a/src/location/declarativemaps/qdeclarativegeoroute.cpp b/src/location/declarativemaps/qdeclarativegeoroute.cpp
deleted file mode 100644
index 5ef76f78..00000000
--- a/src/location/declarativemaps/qdeclarativegeoroute.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtLocation module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativegeoroute_p.h"
-#include <QtLocation/private/qgeomap_p.h>
-#include <QtLocation/private/qgeoroute_p.h>
-#include <QtLocation/private/qdeclarativegeoroutemodel_p.h>
-
-#include <QtPositioning/QGeoRectangle>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmltype Route
-    \instantiates QDeclarativeGeoRoute
-    \inqmlmodule QtLocation
-    \ingroup qml-QtLocation5-routing
-    \since QtLocation 5.5
-
-    \brief The Route type represents one geographical route.
-
-    A Route type contains high level information about a route, such
-    as the length the route, the estimated travel time for the route,
-    and enough information to render a basic image of the route on a map.
-
-    The QGeoRoute object also contains a list of \l routeSegment objects which
-    describe subsections of the route in greater detail.
-
-    The primary means of acquiring Route objects is \l RouteModel.
-
-    \section1 Example
-
-    This example shows how to display a route's maneuvers in a ListView:
-
-    \snippet declarative/routing.qml QtQuick import
-    \snippet declarative/maps.qml QtLocation import
-    \codeline
-    \snippet declarative/routing.qml Route Maneuver List1
-    \snippet declarative/routing.qml Route Maneuver List2
-    \snippet declarative/routing.qml Route Maneuver List3
-
-*/
-
-QDeclarativeGeoRoute::QDeclarativeGeoRoute(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QDeclarativeGeoRoute::QDeclarativeGeoRoute(const QGeoRoute &route, QObject *parent)
-    : QObject(parent), route_(route)
-{
-}
-
-QDeclarativeGeoRoute::~QDeclarativeGeoRoute() {}
-
-/*!
-    \internal
-*/
-QList<QGeoCoordinate> QDeclarativeGeoRoute::routePath()
-{
-    return route_.path();
-}
-
-/*!
-    \qmlproperty georectangle QtLocation::Route::bounds
-
-    Read-only property which holds a bounding box which encompasses the entire route.
-
-*/
-
-QGeoRectangle QDeclarativeGeoRoute::bounds() const
-{
-    return route_.bounds();
-}
-
-/*!
-    \qmlproperty int QtLocation::Route::travelTime
-
-    Read-only property which holds the estimated amount of time it will take to
-    traverse this route, in seconds.
-
-*/
-
-int QDeclarativeGeoRoute::travelTime() const
-{
-    return route_.travelTime();
-}
-
-/*!
-    \qmlproperty real QtLocation::Route::distance
-
-    Read-only property which holds distance covered by this route, in meters.
-*/
-
-qreal QDeclarativeGeoRoute::distance() const
-{
-    return route_.distance();
-}
-
-/*!
-    \qmlproperty list<coordinate> QtLocation::Route::path
-
-    Read-only property which holds the geographical coordinates of this route.
-    Coordinates are listed in the order in which they would be traversed by someone
-    traveling along this segment of the route.
-
-    To access individual segments you can use standard list accessors: 'path.length'
-    indicates the number of objects and 'path[index starting from zero]' gives
-    the actual object.
-
-    \sa QtPositioning::coordinate
-*/
-
-QList<QGeoCoordinate> QDeclarativeGeoRoute::path() const
-{
-    return route_.path();
-}
-
-void QDeclarativeGeoRoute::setPath(const QList<QGeoCoordinate> &value)
-{
-    if (route_.path() == value)
-        return;
-
-    route_.setPath(value);
-    emit pathChanged();
-}
-
-/*!
-    \qmlproperty list<routeSegment> QtLocation::Route::segments
-
-    Read-only property which holds the list of \l routeSegment objects of this route.
-
-    To access individual segments you can use standard list accessors: 'segments.length'
-    indicates the number of objects and 'segments[index starting from zero]' gives
-    the actual objects.
-
-    \sa routeSegment
-*/
-
-QList<QGeoRouteSegment> QDeclarativeGeoRoute::segments()
-{
-    return route_.d_ptr->segments();
-}
-
-/*!
-    \qmlmethod int QtLocation::Route::segmentsCount()
-
-    Returns the number of segments in the route
-
-    \sa routeSegment
-
-    \since 5.11
-*/
-
-int QDeclarativeGeoRoute::segmentsCount() const
-{
-    return route_.d_ptr->segmentsCount();
-}
-
-const QGeoRoute &QDeclarativeGeoRoute::route() const
-{
-    return route_;
-}
-
-/*!
-    \qmlproperty RouteQuery QtLocation::Route::routeQuery
-
-    Returns the route query associated with this route.
-
-    \since 5.11
-*/
-QDeclarativeGeoRouteQuery *QDeclarativeGeoRoute::routeQuery() const
-{
-    if (!routeQuery_) {
-        routeQuery_ = new QDeclarativeGeoRouteQuery(route_.request(),
-                                                    const_cast<QDeclarativeGeoRoute *>(this));
-    }
-    return routeQuery_;
-}
-
-/*!
-    \qmlproperty list<Route> QtLocation::Route::legs
-
-    Returns the route legs associated with this route.
-    Route legs are the sub-routes between each two adjacent waypoints.
-    The result may be empty, if this level of detail is not supported by the
-    backend.
-
-    \since QtLocation 5.12
-*/
-QList<QDeclarativeGeoRoute *> QDeclarativeGeoRoute::legs() const
-{
-    QList<QDeclarativeGeoRoute *> legs;
-    const QList<QGeoRoute> rlegs = route_.routeLegs();
-    for (const auto &r : rlegs)
-        legs.append(new QDeclarativeGeoRoute(r, const_cast<QDeclarativeGeoRoute *>(this)));
-    return legs;
-}
-
-/*!
-    \qmlproperty Object Route::extendedAttributes
-
-    This property holds the extended attributes of the route and is a map.
-    These attributes are plugin specific, and can be empty.
-
-    Consult the \l {Qt Location#Plugin References and Parameters}{plugin documentation}
-    for what attributes are supported and how they should be used.
-
-    Note, due to limitations of the QQmlPropertyMap, it is not possible
-    to declaratively specify the attributes in QML, assignment of attributes keys
-    and values can only be accomplished by JavaScript.
-
-    \since QtLocation 5.13
-*/
-QVariantMap QDeclarativeGeoRoute::extendedAttributes() const
-{
-    return route_.extendedAttributes();
-}
-
-/*!
-    \qmlmethod bool QtLocation::Route::equals(Route other)
-
-    This method performs deep comparison if the present route
-    is identical to the \a other route.
-    Returns \c true if the routes are equal.
-
-    \since 5.12
-*/
-bool QDeclarativeGeoRoute::equals(QDeclarativeGeoRoute *other) const
-{
-    return route_ == other->route_;
-}
-
-/*!
-    \qmlproperty int QtLocation::Route::legIndex
-
-    Read-only property which holds the index of the leg within the containing Route's
-    list of QtLocation::Route::legs. The index is -1 if this route is not a leg within
-    an overall route.
-
-    \sa overallRoute
-*/
-int QDeclarativeGeoRoute::legIndex() const
-{
-    return route_.legIndex();
-}
-
-/*!
-    \qmlproperty Route QtLocation::Route::overallRoute
-
-    Read-only property which holds the Route that contains this leg.
-*/
-
-QDeclarativeGeoRoute *QDeclarativeGeoRoute::overallRoute() const
-{
-    QDeclarativeGeoRoute *containingRoute = qobject_cast<QDeclarativeGeoRoute *>(parent());
-    if (Q_UNLIKELY(!containingRoute))
-        return new QDeclarativeGeoRoute(route_.overallRoute(), parent());
-    return containingRoute;
-}
-
-QT_END_NAMESPACE