summaryrefslogtreecommitdiff
path: root/src/location/maps/qgeomap.cpp
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2016-11-18 19:02:36 +0100
committerPaolo Angelelli <paolo.angelelli@qt.io>2016-11-22 09:28:38 +0000
commit95f8804ecaed79792a57b1fe3580266bfbbf7590 (patch)
tree43c53b67a32deaf4635b13a544d480a241775fa0 /src/location/maps/qgeomap.cpp
parent81b42ba2508241cdeeecdbcdac6f1d22be922022 (diff)
downloadqtlocation-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.cpp')
-rw-r--r--src/location/maps/qgeomap.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index c3b01a3e..0e0a2007 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -51,31 +51,31 @@ QGeoMap::~QGeoMap()
{
}
-void QGeoMap::setSize(const QSize& size)
+void QGeoMap::setViewportSize(const QSize& size)
{
Q_D(QGeoMap);
- if (size == d->m_size)
+ if (size == d->m_viewportSize)
return;
- d->m_size = size;
- d->changeMapSize(size);
+ d->m_viewportSize = size;
+ d->changeViewportSize(size);
}
-QSize QGeoMap::size() const
+QSize QGeoMap::viewportSize() const
{
Q_D(const QGeoMap);
- return d->m_size;
+ return d->m_viewportSize;
}
-int QGeoMap::width() const
+int QGeoMap::viewportWidth() const
{
Q_D(const QGeoMap);
- return d->m_size.width();
+ return d->m_viewportSize.width();
}
-int QGeoMap::height() const
+int QGeoMap::viewportHeight() const
{
Q_D(const QGeoMap);
- return d->m_size.height();
+ return d->m_viewportSize.height();
}
void QGeoMap::setCameraData(const QGeoCameraData &cameraData)