From cab371fec6116c4c758ad88f7c290c3fde016941 Mon Sep 17 00:00:00 2001
From: alex <alex.blasche@nokia.com>
Date: Tue, 4 Oct 2011 14:29:40 +1000
Subject: QGeoManeuver should use implicit shared data copying

This commit also adds the relevant unit test for QGeoManeuver.

Change-Id: I4a55119f9aedea3d8e7a816225feae809d792ed7
Reviewed-on: http://codereview.qt-project.org/5949
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
---
 src/location/maps/qgeomaneuver.cpp | 1 -
 src/location/maps/qgeomaneuver.h   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp
index 382e3bde..c244e038 100644
--- a/src/location/maps/qgeomaneuver.cpp
+++ b/src/location/maps/qgeomaneuver.cpp
@@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE
     point at which two QGeoRouteSegments meet.
 
     \inmodule QtLocation
-    \since 1.1
 
     \ingroup maps-routing
 
diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index dd9a9e67..26603fee 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -42,7 +42,7 @@
 #ifndef QGEOMANEUVER_H
 #define QGEOMANEUVER_H
 
-#include <QExplicitlySharedDataPointer>
+#include <qshareddata.h>
 
 QT_BEGIN_HEADER
 
@@ -104,7 +104,7 @@ public:
     QGeoCoordinate waypoint() const;
 
 private:
-    QExplicitlySharedDataPointer<QGeoManeuverPrivate> d_ptr;
+    QSharedDataPointer<QGeoManeuverPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.1