summaryrefslogtreecommitdiff
path: root/src/location/maps/qgeomap.cpp
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@jollamobile.com>2015-01-16 10:20:34 +1000
committerAaron McCarthy <mccarthy.aaron@gmail.com>2015-01-20 02:46:21 +0100
commitc549b13656fe7bde5536961f168f0f1a68ea3490 (patch)
treee779d64e3cab36d7edcd4ae82387f4881d92b5ff /src/location/maps/qgeomap.cpp
parent9ef638cd502ccf0caa536b4627497767bece0670 (diff)
downloadqtlocation-c549b13656fe7bde5536961f168f0f1a68ea3490.tar.gz
Better names for incorrectly named Map functions.
The functions to transform between coordinates and position on screen were incorrect. Documentation and function names did not match implementation. New functions with better names have been added and documentation updated to match implementation. Old invalid functions have been deprecated. Related private symbols have been renamed to match their purpose. [ChangeLog][QtLocation][Important Behavior Changes] Functions in Map item which are used transform between coordinates and screen position have been deprecated due to confusing naming. Change-Id: Ic501cd81220414800bc2247eae9f510954ee469f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/location/maps/qgeomap.cpp')
-rw-r--r--src/location/maps/qgeomap.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index 93eafd68..31fe29d2 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -120,14 +120,14 @@ QGeoCameraData QGeoMap::cameraData() const
return mapData_->cameraData();
}
-QGeoCoordinate QGeoMap::screenPositionToCoordinate(const QDoubleVector2D &pos, bool clipToViewport) const
+QGeoCoordinate QGeoMap::itemPositionToCoordinate(const QDoubleVector2D &pos, bool clipToViewport) const
{
- return mapData_->screenPositionToCoordinate(pos, clipToViewport);
+ return mapData_->itemPositionToCoordinate(pos, clipToViewport);
}
-QDoubleVector2D QGeoMap::coordinateToScreenPosition(const QGeoCoordinate &coordinate, bool clipToViewport) const
+QDoubleVector2D QGeoMap::coordinateToItemPosition(const QGeoCoordinate &coordinate, bool clipToViewport) const
{
- return mapData_->coordinateToScreenPosition(coordinate, clipToViewport);
+ return mapData_->coordinateToItemPosition(coordinate, clipToViewport);
}
void QGeoMap::update()