diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2016-11-18 19:02:36 +0100 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2016-11-22 09:28:38 +0000 |
commit | 95f8804ecaed79792a57b1fe3580266bfbbf7590 (patch) | |
tree | 43c53b67a32deaf4635b13a544d480a241775fa0 /src/location/maps/qgeomap_p_p.h | |
parent | 81b42ba2508241cdeeecdbcdac6f1d22be922022 (diff) | |
download | qtlocation-95f8804ecaed79792a57b1fe3580266bfbbf7590.tar.gz |
Renaming QGeoMapPrivate::changeMapSize to changeViewportSize
The current name of this method generate confusion, as what it does
is changing the size of the final element in the application, and not
the actual map size.
This patch renames this method to changeDisplaySize
It also renames QGeoMap::setSize to setViewportSize,
as well as ::size to viewportSize , width to viewportWidth
and height to viewportHeight, to make everything consistent and
self-explanatory.
Finally it also renames minimumZoomAtMapSize to
minimumZoomAtViewportSize.
Change-Id: I7c1ca8bb3ca3d6f6b0fe6fc881b9300db7110527
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/maps/qgeomap_p_p.h')
-rw-r--r-- | src/location/maps/qgeomap_p_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h index f72c35ba..b95c1dc7 100644 --- a/src/location/maps/qgeomap_p_p.h +++ b/src/location/maps/qgeomap_p_p.h @@ -68,12 +68,13 @@ public: virtual ~QGeoMapPrivate(); protected: - virtual void changeMapSize(const QSize &size) = 0; - virtual void changeCameraData(const QGeoCameraData &oldCameraData) = 0; - virtual void changeActiveMapType(const QGeoMapType mapType) = 0; + /* Hooks into the actual map implementations */ + virtual void changeViewportSize(const QSize &size) = 0; // called by QGeoMap::setSize() + virtual void changeCameraData(const QGeoCameraData &oldCameraData) = 0; // called by QGeoMap::setCameraData() + virtual void changeActiveMapType(const QGeoMapType mapType) = 0; // called by QGeoMap::setActiveMapType() protected: - QSize m_size; + QSize m_viewportSize; QPointer<QGeoMappingManagerEngine> m_engine; QGeoMapController *m_controller; QGeoCameraData m_cameraData; |