1 files changed, 81 insertions, 13 deletions
diff --git a/src/location/maps/qgeomaneuver_p.h b/src/location/maps/qgeomaneuver_p.h
index 4a491b73..8f2e7eca 100644
--- a/src/location/maps/qgeomaneuver_p.h
+++ b/src/location/maps/qgeomaneuver_p.h
@@ -48,32 +48,100 @@
 // We mean it.
 //
 
-#include "qgeomaneuver.h"
-#include "qgeocoordinate.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/qgeomaneuver.h>
+#include <QtPositioning/qgeocoordinate.h>
 
 #include <QSharedData>
 #include <QString>
 
 QT_BEGIN_NAMESPACE
 
-class QGeoManeuverPrivate : public QSharedData
+class Q_LOCATION_PRIVATE_EXPORT QGeoManeuverPrivate : public QSharedData
 {
 public:
     QGeoManeuverPrivate();
     QGeoManeuverPrivate(const QGeoManeuverPrivate &other);
-    ~QGeoManeuverPrivate();
+    virtual ~QGeoManeuverPrivate();
+    virtual QGeoManeuverPrivate *clone() = 0;
 
     bool operator== (const QGeoManeuverPrivate &other) const;
 
-    bool valid;
-    QString id;
-    QGeoCoordinate position;
-    QString text;
-    QGeoManeuver::InstructionDirection direction;
-    int timeToNextInstruction;
-    qreal distanceToNextInstruction;
-    QGeoCoordinate waypoint;
-    QVariantMap extendedAttributes;
+    virtual bool valid() const;
+    virtual void setValid(bool valid);
+
+    virtual QString id() const;
+    virtual void setId(const QString id);
+
+    virtual QGeoCoordinate position() const;
+    virtual void setPosition(const QGeoCoordinate &position);
+
+    virtual QString text() const;
+    virtual void setText(const QString &text);
+
+    virtual QGeoManeuver::InstructionDirection direction() const;
+    virtual void setDirection(QGeoManeuver::InstructionDirection direction);
+
+    virtual int timeToNextInstruction() const;
+    virtual void setTimeToNextInstruction(int timeToNextInstruction);
+
+    virtual qreal distanceToNextInstruction() const;
+    virtual void setDistanceToNextInstruction(qreal distanceToNextInstruction);
+
+    virtual QGeoCoordinate waypoint() const;
+    virtual void setWaypoint(const QGeoCoordinate &waypoint);
+
+    virtual QVariantMap extendedAttributes() const;
+    virtual void setExtendedAttributes(const QVariantMap &extendedAttributes);
+
+protected:
+    virtual bool equals(const QGeoManeuverPrivate &other) const;
+};
+
+class Q_LOCATION_PRIVATE_EXPORT QGeoManeuverPrivateDefault : public QGeoManeuverPrivate
+{
+public:
+    QGeoManeuverPrivateDefault();
+    QGeoManeuverPrivateDefault(const QGeoManeuverPrivateDefault &other);
+    ~QGeoManeuverPrivateDefault();
+    virtual QGeoManeuverPrivate *clone() override;
+
+    virtual bool valid() const override;
+    virtual void setValid(bool valid) override;
+
+    virtual QString id() const override;
+    virtual void setId(const QString id) override;
+
+    virtual QGeoCoordinate position() const override;
+    virtual void setPosition(const QGeoCoordinate &position) override;
+
+    virtual QString text() const override;
+    virtual void setText(const QString &text) override;
+
+    virtual QGeoManeuver::InstructionDirection direction() const override;
+    virtual void setDirection(QGeoManeuver::InstructionDirection direction) override;
+
+    virtual int timeToNextInstruction() const override;
+    virtual void setTimeToNextInstruction(int timeToNextInstruction) override;
+
+    virtual qreal distanceToNextInstruction() const override;
+    virtual void setDistanceToNextInstruction(qreal distanceToNextInstruction) override;
+
+    virtual QGeoCoordinate waypoint() const override;
+    virtual void setWaypoint(const QGeoCoordinate &waypoint) override;
+
+    virtual QVariantMap extendedAttributes() const override;
+    virtual void setExtendedAttributes(const QVariantMap &extendedAttributes) override;
+
+    bool m_valid;
+    QString m_id;
+    QGeoCoordinate m_position;
+    QString m_text;
+    QGeoManeuver::InstructionDirection m_direction;
+    int m_timeToNextInstruction;
+    qreal m_distanceToNextInstruction;
+    QGeoCoordinate m_waypoint;
+    QVariantMap m_extendedAttributes;
 };
 
 QT_END_NAMESPACE