diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-04-13 16:50:12 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-05-05 13:03:04 +0000 |
| commit | 4fb86e6d29a13d61ac04a302e4d312de349115f8 (patch) | |
| tree | 1d8e2f55a555324b297520c783d973681415c894 /src/location/maps/qgeomap_p.h | |
| parent | cbe2583de456f18ddd2e4e5d2da225935aac1475 (diff) | |
| download | qtlocation-4fb86e6d29a13d61ac04a302e4d312de349115f8.tar.gz | |
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>
Diffstat (limited to 'src/location/maps/qgeomap_p.h')
| -rw-r--r-- | src/location/maps/qgeomap_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h index caaf3dfe..d3c83147 100644 --- a/src/location/maps/qgeomap_p.h +++ b/src/location/maps/qgeomap_p.h @@ -68,7 +68,6 @@ class Q_LOCATION_EXPORT QGeoMap : public QObject Q_DECLARE_PRIVATE(QGeoMap) public: - QGeoMap(QGeoMappingManagerEngine *engine, QObject *parent = 0); virtual ~QGeoMap(); QGeoMapController *mapController(); @@ -79,7 +78,6 @@ public: int width() const; int height() const; - void setCameraData(const QGeoCameraData &cameraData); QGeoCameraData cameraData() const; void setActiveMapType(const QGeoMapType mapType); @@ -87,15 +85,15 @@ public: virtual QGeoCoordinate itemPositionToCoordinate(const QDoubleVector2D &pos, bool clipToViewport = true) const = 0; virtual QDoubleVector2D coordinateToItemPosition(const QGeoCoordinate &coordinate, bool clipToViewport = true) const = 0; + virtual int mapVersion(); QString pluginString(); QGeoCameraCapabilities cameraCapabilities(); QGeoMappingManagerEngine *engine(); protected: - virtual void mapResized(int width, int height) = 0; - virtual void changeCameraData(const QGeoCameraData &oldCameraData) = 0; - virtual void changeActiveMapType(const QGeoMapType mapType) = 0; + QGeoMap(QGeoMapPrivate &dd, QObject *parent = 0); + void setCameraData(const QGeoCameraData &cameraData); public Q_SLOTS: void update(); @@ -110,6 +108,7 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QGeoMap) + friend class QGeoMapController; }; QT_END_NAMESPACE |