Fixes PIMPL in QGeoTiledMap.

This commit makes following changes:
* QGeoTiledMapPrivate is now a subclass of QGeoMapPrivate.
* makes QGeoMap constructor private.
* change visibility of setCameraData in QGeoMap, so that
  only QGeoMapController can modify the camera data.
* moves mapResized,changeCameraData,changeActiveMapType
  to private implementation interface.
* moves mapVersion member function to base class.

Change-Id: I336e7f72b03e845e09e445a6eebad90b2e46dbd1
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/location/maps/qgeotiledmap_p.h b/src/location/maps/qgeotiledmap_p.h
index 12e9b409..c681a6b6 100644
--- a/src/location/maps/qgeotiledmap_p.h
+++ b/src/location/maps/qgeotiledmap_p.h
@@ -73,6 +73,8 @@ class QPointF;
 class Q_LOCATION_EXPORT QGeoTiledMap : public QGeoMap
 {
     Q_OBJECT
+    Q_DECLARE_PRIVATE(QGeoTiledMap)
+
 public:
     QGeoTiledMap(QGeoTiledMappingManagerEngine *engine, QObject *parent);
     virtual ~QGeoTiledMap();
@@ -87,13 +89,7 @@ public:
     // Alternative to exposing this is to make tileFetched a slot, but then requestManager would
     // need to be a QObject
     QGeoTileRequestManager *getRequestManager();
-
-    virtual int mapVersion();
-
 protected:
-    void mapResized(int width, int height) Q_DECL_OVERRIDE;
-    void changeCameraData(const QGeoCameraData &oldCameraData) Q_DECL_OVERRIDE;
-    void changeActiveMapType(const QGeoMapType mapType) Q_DECL_OVERRIDE;
     void prefetchData() Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
@@ -101,8 +97,6 @@ protected Q_SLOTS:
     void updateMapVersion();
 
 private:
-    QGeoTiledMapPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(QGeoTiledMap)
     Q_DISABLE_COPY(QGeoTiledMap)
 
 };