Cleanup: de-virtualize QGeoRoutePrivate

The possibility to override this type in plugins was used for metadata
that might just as well live in the extended attributes. And the usecase
of making the basic passing of data from a private through a public type
does not justify the overhead, and can be solved by simply initializing
the value in the test plugin through the public setter.

So remove this; if this is really needed for anything, then we can bring
it back later.

Change-Id: Iad8689b54f64fa89535d0ebc3c399b4fd054f9d7
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>

6 files changed, 81 insertions, 405 deletions

diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp
index d5621bbe..1b7b938b 100644
--- a/src/location/maps/qgeoroute.cpp
+++ b/src/location/maps/qgeoroute.cpp
@@ -48,11 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-template<>
-QGeoRoutePrivate *QExplicitlySharedDataPointer<QGeoRoutePrivate>::clone()
-{
-    return d->clone();
-}
 QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QGeoRoutePrivate)
 
 /*!
@@ -82,14 +77,8 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QGeoRoutePrivate)
     Constructs a route object.
 */
 QGeoRoute::QGeoRoute()
-    : d_ptr(new QGeoRoutePrivateDefault()) {}
-
-/*!
-    Constructs a route object using \a dd as private implementation.
-*/
-QGeoRoute::QGeoRoute(const QExplicitlySharedDataPointer<QGeoRoutePrivate> &dd): d_ptr(dd)
-{
-}
+    : d_ptr(new QGeoRoutePrivate())
+{}
 
 /*!
     Returns the private implementation.
@@ -380,18 +369,6 @@ QGeoRoute QGeoRoute::overallRoute() const
 /*******************************************************************************
 *******************************************************************************/
 
-QGeoRoutePrivate::QGeoRoutePrivate()
-{
-
-}
-
-QGeoRoutePrivate::QGeoRoutePrivate(const QGeoRoutePrivate &other) : QSharedData(other)
-{
-
-}
-
-QGeoRoutePrivate::~QGeoRoutePrivate() {}
-
 bool QGeoRoutePrivate::operator ==(const QGeoRoutePrivate &other) const
 {
     return equals(other);
@@ -399,10 +376,7 @@ bool QGeoRoutePrivate::operator ==(const QGeoRoutePrivate &other) const
 
 bool QGeoRoutePrivate::equals(const QGeoRoutePrivate &other) const
 {
-    if (!other.engineName().isEmpty()) // only way to know if other comes from an engine without dynamic_cast
-        return false;
-
-    // here both routes are of type QGeoRoutePrivateDefault
+    // here both routes are of type QGeoRoutePrivate
     QGeoRouteSegment s1 = firstSegment();
     QGeoRouteSegment s2 = other.firstSegment();
 
@@ -417,268 +391,99 @@ bool QGeoRoutePrivate::equals(const QGeoRoutePrivate &other) const
         s2 = s2.nextRouteSegment();
     }
 
-    return (   (id() == other.id())
-            && (request() == other.request())
-            && (bounds() == other.bounds())
-            && (travelTime() == other.travelTime())
-            && (distance() == other.distance())
-            && (travelMode() == other.travelMode())
-            && (path() == other.path())
-            && (metadata() == other.metadata())
-            && (routeLegs() == other.routeLegs())
-            && (extendedAttributes() == other.extendedAttributes()) );
+    return id() == other.id()
+        && request() == other.request()
+        && bounds() == other.bounds()
+        && travelTime() == other.travelTime()
+        && distance() == other.distance()
+        && travelMode() == other.travelMode()
+        && path() == other.path()
+        && routeLegs() == other.routeLegs()
+        && extendedAttributes() == other.extendedAttributes();
 }
 
 void QGeoRoutePrivate::setId(const QString &id)
 {
-    Q_UNUSED(id);
-}
-
-QString QGeoRoutePrivate::id() const
-{
-    return QString();
-}
-
-void QGeoRoutePrivate::setRequest(const QGeoRouteRequest &request)
-{
-    Q_UNUSED(request);
-}
-
-QGeoRouteRequest QGeoRoutePrivate::request() const
-{
-    return QGeoRouteRequest();
-}
-
-void QGeoRoutePrivate::setBounds(const QGeoRectangle &bounds)
-{
-    Q_UNUSED(bounds);
-}
-
-QGeoRectangle QGeoRoutePrivate::bounds() const
-{
-    return QGeoRectangle();
-}
-
-void QGeoRoutePrivate::setTravelTime(int travelTime)
-{
-    Q_UNUSED(travelTime);
-}
-
-int QGeoRoutePrivate::travelTime() const
-{
-    return 0;
-}
-
-void QGeoRoutePrivate::setDistance(qreal distance)
-{
-    Q_UNUSED(distance);
-}
-
-qreal QGeoRoutePrivate::distance() const
-{
-    return 0;
-}
-
-void QGeoRoutePrivate::setTravelMode(QGeoRouteRequest::TravelMode mode)
-{
-    Q_UNUSED(mode);
-}
-
-QGeoRouteRequest::TravelMode QGeoRoutePrivate::travelMode() const
-{
-    return QGeoRouteRequest::CarTravel;
-}
-
-void QGeoRoutePrivate::setPath(const QList<QGeoCoordinate> &path)
-{
-    Q_UNUSED(path);
-}
-
-QList<QGeoCoordinate> QGeoRoutePrivate::path() const
-{
-    return QList<QGeoCoordinate>();
-}
-
-void QGeoRoutePrivate::setFirstSegment(const QGeoRouteSegment &firstSegment)
-{
-    Q_UNUSED(firstSegment);
-}
-
-QGeoRouteSegment QGeoRoutePrivate::firstSegment() const
-{
-    return QGeoRouteSegment();
-}
-
-const QGeoRoutePrivate *QGeoRoutePrivate::routePrivateData(const QGeoRoute &route)
-{
-    return route.d_ptr.data();
-}
-
-QVariantMap QGeoRoutePrivate::metadata() const
-{
-    return QVariantMap();
-}
-
-void QGeoRoutePrivate::setRouteLegs(const QList<QGeoRoute> &/*legs*/)
-{
-
-}
-
-QList<QGeoRoute> QGeoRoutePrivate::routeLegs() const
-{
-    return QList<QGeoRoute>();
-}
-
-void QGeoRoutePrivate::setExtendedAttributes(const QVariantMap &/*extendedAttributes*/)
-{
-
-}
-
-QVariantMap QGeoRoutePrivate::extendedAttributes() const
-{
-    return QVariantMap();
-}
-
-void QGeoRoutePrivate::setLegIndex(int /*idx*/)
-{
-
-}
-
-int QGeoRoutePrivate::legIndex() const
-{
-    return 0;
-}
-
-void QGeoRoutePrivate::setContainingRoute(const QGeoRoute &/*route*/)
-{
-
-}
-
-QGeoRoute QGeoRoutePrivate::containingRoute() const
-{
-    return QGeoRoute();
-}
-
-/*******************************************************************************
-*******************************************************************************/
-
-
-QGeoRoutePrivateDefault::QGeoRoutePrivateDefault()
-    : m_travelTime(0),
-      m_distance(0.0),
-      m_travelMode(QGeoRouteRequest::CarTravel),
-      m_numSegments(-1) {}
-
-QGeoRoutePrivateDefault::QGeoRoutePrivateDefault(const QGeoRoutePrivateDefault &other)
-    : QGeoRoutePrivate(other),
-      m_id(other.m_id),
-      m_request(other.m_request),
-      m_bounds(other.m_bounds),
-      m_routeSegments(other.m_routeSegments),
-      m_travelTime(other.m_travelTime),
-      m_distance(other.m_distance),
-      m_travelMode(other.m_travelMode),
-      m_path(other.m_path),
-      m_legs(other.m_legs),
-      m_firstSegment(other.m_firstSegment),
-      m_numSegments(other.m_numSegments),
-      m_extendedAttributes(other.m_extendedAttributes) {} // Purposedly ignoring legIndex and parentRoute
-
-
-QGeoRoutePrivateDefault::~QGeoRoutePrivateDefault() {}
-
-QGeoRoutePrivate *QGeoRoutePrivateDefault::clone()
-{
-    return new QGeoRoutePrivateDefault(*this);
-}
-
-void QGeoRoutePrivateDefault::setId(const QString &id)
-{
     m_id = id;
 }
 
-QString QGeoRoutePrivateDefault::id() const
+QString QGeoRoutePrivate::id() const
 {
     return m_id;
 }
 
-void QGeoRoutePrivateDefault::setRequest(const QGeoRouteRequest &request)
+void QGeoRoutePrivate::setRequest(const QGeoRouteRequest &request)
 {
     m_request = request;
 }
 
-QGeoRouteRequest QGeoRoutePrivateDefault::request() const
+QGeoRouteRequest QGeoRoutePrivate::request() const
 {
     return m_request;
 }
 
-void QGeoRoutePrivateDefault::setBounds(const QGeoRectangle &bounds)
+void QGeoRoutePrivate::setBounds(const QGeoRectangle &bounds)
 {
     m_bounds = bounds;
 }
 
-QGeoRectangle QGeoRoutePrivateDefault::bounds() const
+QGeoRectangle QGeoRoutePrivate::bounds() const
 {
     return m_bounds;
 }
 
-void QGeoRoutePrivateDefault::setTravelTime(int travelTime)
+void QGeoRoutePrivate::setTravelTime(int travelTime)
 {
     m_travelTime = travelTime;
 }
 
-int QGeoRoutePrivateDefault::travelTime() const
+int QGeoRoutePrivate::travelTime() const
 {
     return m_travelTime;
 }
 
-void QGeoRoutePrivateDefault::setDistance(qreal distance)
+void QGeoRoutePrivate::setDistance(qreal distance)
 {
     m_distance = distance;
 }
 
-qreal QGeoRoutePrivateDefault::distance() const
+qreal QGeoRoutePrivate::distance() const
 {
     return m_distance;
 }
 
-void QGeoRoutePrivateDefault::setTravelMode(QGeoRouteRequest::TravelMode mode)
+void QGeoRoutePrivate::setTravelMode(QGeoRouteRequest::TravelMode mode)
 {
     m_travelMode = mode;
 }
 
-QGeoRouteRequest::TravelMode QGeoRoutePrivateDefault::travelMode() const
+QGeoRouteRequest::TravelMode QGeoRoutePrivate::travelMode() const
 {
     return m_travelMode;
 }
 
-void QGeoRoutePrivateDefault::setPath(const QList<QGeoCoordinate> &path)
+void QGeoRoutePrivate::setPath(const QList<QGeoCoordinate> &path)
 {
     m_path = path;
 }
 
-QList<QGeoCoordinate> QGeoRoutePrivateDefault::path() const
+QList<QGeoCoordinate> QGeoRoutePrivate::path() const
 {
     return m_path;
 }
 
-void QGeoRoutePrivateDefault::setFirstSegment(const QGeoRouteSegment &firstSegment)
+void QGeoRoutePrivate::setFirstSegment(const QGeoRouteSegment &firstSegment)
 {
     m_firstSegment = firstSegment;
     m_numSegments = -1;
 }
 
-QGeoRouteSegment QGeoRoutePrivateDefault::firstSegment() const
+QGeoRouteSegment QGeoRoutePrivate::firstSegment() const
 {
     return m_firstSegment;
 }
 
-QString QGeoRoutePrivateDefault::engineName() const
-{
-    return QString();
-}
-
-int QGeoRoutePrivateDefault::segmentsCount() const
+int QGeoRoutePrivate::segmentsCount() const
 {
     if (m_numSegments >= 0)
         return m_numSegments;
@@ -691,7 +496,7 @@ int QGeoRoutePrivateDefault::segmentsCount() const
     return count;
 }
 
-QList<QGeoRouteSegment> QGeoRoutePrivateDefault::segments() const
+QList<QGeoRouteSegment> QGeoRoutePrivate::segments() const
 {
     QList<QGeoRouteSegment> segments;
     forEachSegment([&segments](const QGeoRouteSegment &segment){
@@ -700,43 +505,43 @@ QList<QGeoRouteSegment> QGeoRoutePrivateDefault::segments() const
     return segments;
 }
 
-void QGeoRoutePrivateDefault::setRouteLegs(const QList<QGeoRoute> &legs)
+void QGeoRoutePrivate::setRouteLegs(const QList<QGeoRoute> &legs)
 {
     m_legs = legs;
 }
 
-QList<QGeoRoute> QGeoRoutePrivateDefault::routeLegs() const
+QList<QGeoRoute> QGeoRoutePrivate::routeLegs() const
 {
     return m_legs;
 }
 
-void QGeoRoutePrivateDefault::setExtendedAttributes(const QVariantMap &extendedAttributes)
+void QGeoRoutePrivate::setExtendedAttributes(const QVariantMap &extendedAttributes)
 {
     m_extendedAttributes = extendedAttributes;
 }
 
-QVariantMap QGeoRoutePrivateDefault::extendedAttributes() const
+QVariantMap QGeoRoutePrivate::extendedAttributes() const
 {
     return m_extendedAttributes;
 }
 
-void QGeoRoutePrivateDefault::setLegIndex(int idx)
+void QGeoRoutePrivate::setLegIndex(int idx)
 {
     if (idx >= 0)
         m_legIndex = idx;
 }
 
-int QGeoRoutePrivateDefault::legIndex() const
+int QGeoRoutePrivate::legIndex() const
 {
     return m_legIndex;
 }
 
-void QGeoRoutePrivateDefault::setContainingRoute(const QGeoRoute &route)
+void QGeoRoutePrivate::setContainingRoute(const QGeoRoute &route)
 {
     m_containingRoute.reset(new QGeoRoute(route));
 }
 
-QGeoRoute QGeoRoutePrivateDefault::containingRoute() const
+QGeoRoute QGeoRoutePrivate::containingRoute() const
 {
     if (m_containingRoute)
         return *m_containingRoute;
diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h
index 3966ef0f..99eb699e 100644
--- a/src/location/maps/qgeoroute.h
+++ b/src/location/maps/qgeoroute.h
@@ -119,7 +119,6 @@ public:
     QGeoRoute overallRoute() const;
 
 protected:
-    QGeoRoute(const QExplicitlySharedDataPointer<QGeoRoutePrivate> &dd);
     QExplicitlySharedDataPointer<QGeoRoutePrivate> &d();
     const QExplicitlySharedDataPointer<QGeoRoutePrivate> &const_d() const;
 
diff --git a/src/location/maps/qgeoroute_p.h b/src/location/maps/qgeoroute_p.h
index 2eddb103..da17455a 100644
--- a/src/location/maps/qgeoroute_p.h
+++ b/src/location/maps/qgeoroute_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtLocation module of the Qt Toolkit.
@@ -65,111 +65,50 @@ QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoRoutePrivate : public QSharedData
+class QGeoRoutePrivate : public QSharedData
 {
 public:
-    QGeoRoutePrivate();
-    QGeoRoutePrivate(const QGeoRoutePrivate &other);
-    virtual ~QGeoRoutePrivate();
-    virtual QGeoRoutePrivate *clone() = 0;
+    bool operator==(const QGeoRoutePrivate &other) const;
+    bool equals(const QGeoRoutePrivate &other) const;
 
-    bool operator == (const QGeoRoutePrivate &other) const;
+    void setId(const QString &id);
+    QString id() const;
 
-    virtual void setId(const QString &id);
-    virtual QString id() const;
+    void setRequest(const QGeoRouteRequest &request);
+    QGeoRouteRequest request() const;
 
-    virtual void setRequest(const QGeoRouteRequest &request);
-    virtual QGeoRouteRequest request() const;
+    void setBounds(const QGeoRectangle &bounds);
+    QGeoRectangle bounds() const;
 
-    virtual void setBounds(const QGeoRectangle &bounds);
-    virtual QGeoRectangle bounds() const;
+    void setTravelTime(int travelTime);
+    int travelTime() const;
 
-    virtual void setTravelTime(int travelTime);
-    virtual int travelTime() const;
+    void setDistance(qreal distance);
+    qreal distance() const;
 
-    virtual void setDistance(qreal distance);
-    virtual qreal distance() const;
+    void setTravelMode(QGeoRouteRequest::TravelMode mode);
+    QGeoRouteRequest::TravelMode travelMode() const;
 
-    virtual void setTravelMode(QGeoRouteRequest::TravelMode mode);
-    virtual QGeoRouteRequest::TravelMode travelMode() const;
+    void setPath(const QList<QGeoCoordinate> &path);
+    QList<QGeoCoordinate> path() const;
 
-    virtual void setPath(const QList<QGeoCoordinate> &path);
-    virtual QList<QGeoCoordinate> path() const;
+    void setFirstSegment(const QGeoRouteSegment &firstSegment);
+    QGeoRouteSegment firstSegment() const;
 
-    virtual void setFirstSegment(const QGeoRouteSegment &firstSegment);
-    virtual QGeoRouteSegment firstSegment() const;
+    int segmentsCount() const;
+    QList<QGeoRouteSegment> segments() const;
 
-    virtual QVariantMap metadata() const;
+    void setRouteLegs(const QList<QGeoRoute> &legs);
+    QList<QGeoRoute> routeLegs() const;
 
-    virtual void setRouteLegs(const QList<QGeoRoute> &legs);
-    virtual QList<QGeoRoute> routeLegs() const;
-
-    virtual void setExtendedAttributes(const QVariantMap &extendedAttributes);
-    virtual QVariantMap extendedAttributes() const;
-
-    virtual QString engineName() const = 0;
-    virtual int segmentsCount() const = 0;
-    virtual QList<QGeoRouteSegment> segments() const = 0;
-
-    // QGeoRouteLeg API
-    virtual void setLegIndex(int idx);
-    virtual int legIndex() const;
-    virtual void setContainingRoute(const QGeoRoute &route);
-    virtual QGeoRoute containingRoute() const;
-
-    static const QGeoRoutePrivate *routePrivateData(const QGeoRoute &route);
-
-protected:
-    virtual bool equals(const QGeoRoutePrivate &other) const;
-};
-
-class Q_LOCATION_PRIVATE_EXPORT  QGeoRoutePrivateDefault : public QGeoRoutePrivate
-{
-public:
-    QGeoRoutePrivateDefault();
-    QGeoRoutePrivateDefault(const QGeoRoutePrivateDefault &other);
-    ~QGeoRoutePrivateDefault() override;
-    QGeoRoutePrivate *clone() override;
-
-    void setId(const QString &id) override;
-    QString id() const override;
-
-    void setRequest(const QGeoRouteRequest &request) override;
-    QGeoRouteRequest request() const override;
-
-    void setBounds(const QGeoRectangle &bounds) override;
-    QGeoRectangle bounds() const override;
-
-    void setTravelTime(int travelTime) override;
-    int travelTime() const override;
-
-    void setDistance(qreal distance) override;
-    qreal distance() const override;
-
-    void setTravelMode(QGeoRouteRequest::TravelMode mode) override;
-    QGeoRouteRequest::TravelMode travelMode() const override;
-
-    void setPath(const QList<QGeoCoordinate> &path) override;
-    QList<QGeoCoordinate> path() const override;
-
-    void setFirstSegment(const QGeoRouteSegment &firstSegment) override;
-    QGeoRouteSegment firstSegment() const override;
-
-    QString engineName() const override;
-    int segmentsCount() const override;
-    QList<QGeoRouteSegment> segments() const override;
-
-    void setRouteLegs(const QList<QGeoRoute> &legs) override;
-    QList<QGeoRoute> routeLegs() const override;
-
-    void setExtendedAttributes(const QVariantMap &extendedAttributes) override;
-    QVariantMap extendedAttributes() const override;
+    void setExtendedAttributes(const QVariantMap &extendedAttributes);
+    QVariantMap extendedAttributes() const;
 
     // QGeoRouteLeg API
-    void setLegIndex(int idx) override;
-    int legIndex() const override;
-    void setContainingRoute(const QGeoRoute &route) override;
-    QGeoRoute containingRoute() const override;
+    void setLegIndex(int idx);
+    int legIndex() const;
+    void setContainingRoute(const QGeoRoute &route);
+    QGeoRoute containingRoute() const;
 
 private:
     template<typename Functor>
@@ -189,15 +128,15 @@ private:
     QGeoRectangle m_bounds;
     mutable QList<QGeoRouteSegment> m_routeSegments;
 
-    int m_travelTime;
-    qreal m_distance;
+    int m_travelTime = 0;
+    qreal m_distance = 0.0;
 
     QGeoRouteRequest::TravelMode m_travelMode;
 
     QList<QGeoCoordinate> m_path;
     QList<QGeoRoute> m_legs;
     QGeoRouteSegment m_firstSegment;
-    mutable int m_numSegments;
+    mutable int m_numSegments = -1;
     std::unique_ptr<QGeoRoute> m_containingRoute;
     QVariantMap m_extendedAttributes;
     int m_legIndex = -1;
diff --git a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
index e85c5bb1..20dff6c9 100644
--- a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
@@ -48,48 +48,6 @@
 #include <QtLocation/QGeoRouteSegment>
 #include <QtLocation/QGeoManeuver>
 
-namespace {
-
-class QGeoRouteMapbox : public QGeoRoute
-{
-public:
-    QGeoRouteMapbox(const QGeoRoute &other, const QVariantMap &metadata);
-};
-
-class QGeoRoutePrivateMapbox : public QGeoRoutePrivateDefault
-{
-public:
-    QGeoRoutePrivateMapbox(const QGeoRoutePrivateDefault &other, const QVariantMap &metadata);
-
-    QString engineName() const override;
-    QVariantMap metadata() const override;
-
-    QVariantMap m_metadata;
-};
-
-QGeoRouteMapbox::QGeoRouteMapbox(const QGeoRoute &other, const QVariantMap &metadata)
-    : QGeoRoute(QExplicitlySharedDataPointer<QGeoRoutePrivateMapbox>(new QGeoRoutePrivateMapbox(*static_cast<const QGeoRoutePrivateDefault *>(QGeoRoutePrivate::routePrivateData(other)), metadata)))
-{
-}
-
-QGeoRoutePrivateMapbox::QGeoRoutePrivateMapbox(const QGeoRoutePrivateDefault &other, const QVariantMap &metadata)
-    : QGeoRoutePrivateDefault(other)
-    , m_metadata(metadata)
-{
-}
-
-QString QGeoRoutePrivateMapbox::engineName() const
-{
-    return QStringLiteral("mapbox");
-}
-
-QVariantMap QGeoRoutePrivateMapbox::metadata() const
-{
-    return m_metadata;
-}
-
-} // namespace
-
 QT_BEGIN_NAMESPACE
 
 QGeoRouteReplyMapbox::QGeoRouteReplyMapbox(QNetworkReply *reply, const QGeoRouteRequest &request,
@@ -139,9 +97,14 @@ void QGeoRouteReplyMapbox::networkReplyFinished()
     QVariantMap metadata;
     metadata["osrm.reply-json"] = routeReply;
 
+    QVariantMap extAttr;
+    extAttr["engine"] = "mapbox";
+    extAttr["metadata"] = metadata;
+
     QList<QGeoRoute> mapboxRoutes;
     for (const QGeoRoute &route : routes.mid(0, request().numberAlternativeRoutes() + 1)) {
-        QGeoRouteMapbox mapboxRoute(route, metadata);
+        QGeoRoute mapboxRoute(route);
+        mapboxRoute.setExtendedAttributes(extAttr);
         mapboxRoutes.append(mapboxRoute);
     }
 
diff --git a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
index e1815b35..a889c393 100644
--- a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
@@ -42,36 +42,6 @@
 
 QT_USE_NAMESPACE
 
-
-class QGeoRoutePrivateDefaultAlt : public QGeoRoutePrivateDefault
-{
-public:
-    QGeoRoutePrivateDefaultAlt() : QGeoRoutePrivateDefault()
-    {
-    }
-    QGeoRoutePrivateDefaultAlt(const QGeoRoutePrivateDefaultAlt &other)
-        : QGeoRoutePrivateDefault(other) {}
-    ~QGeoRoutePrivateDefaultAlt() {}
-
-    void setTravelTime(int travelTime) override
-    {
-        Q_UNUSED(travelTime);
-    }
-    int travelTime() const override
-    {
-        return 123456; // To identify this is actually a QGeoRoutePrivateDefaultAlt
-    }
-};
-
-class QGeoRouteAlt : public QGeoRoute
-{
-public:
-    QGeoRouteAlt()
-    : QGeoRoute(QExplicitlySharedDataPointer<QGeoRoutePrivate>(new QGeoRoutePrivateDefaultAlt()))
-    {
-    }
-};
-
 class RouteReplyTest :public QGeoRouteReply
 {
     Q_OBJECT
@@ -176,10 +146,10 @@ public:
 
         for (int i = 0; i < request.numberAlternativeRoutes(); ++i) {
             QGeoRoute route;
-            if (alternateGeoRouteImplementation_)
-                route = QGeoRouteAlt();
             route.setPath(request.waypoints());
             route.setTravelTime(travelTime);
+            if (alternateGeoRouteImplementation_)
+                route.setTravelTime(123456);
 
             const QList<QVariantMap> metadata = request.waypointsMetadata();
             for (const auto &meta: metadata) {
diff --git a/tests/auto/qgeoroute/tst_qgeoroute.cpp b/tests/auto/qgeoroute/tst_qgeoroute.cpp
index e3fb4f08..feb61099 100644
--- a/tests/auto/qgeoroute/tst_qgeoroute.cpp
+++ b/tests/auto/qgeoroute/tst_qgeoroute.cpp
@@ -251,11 +251,11 @@ void tst_QGeoRoute::operators()
     QVERIFY(!(qgeoroute != qgeoroutecopy));
 
 
-    QGeoRouteAlt rAlt;
     QGeoRoute r;
-    QCOMPARE(rAlt.travelTime(), 123456);
     QCOMPARE(r.travelTime(), 0);
-    r = rAlt;
+    QGeoRoute r2;
+    r2.setTravelTime(123456);
+    r = r2;
     QCOMPARE(r.travelTime(), 123456);
 }