diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2016-12-02 16:02:31 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-01-16 16:18:20 +0000 |
| commit | 5504a4c00ec01fdbc95a862c9bc63a680095daee (patch) | |
| tree | 5afa841903c4a55e2162a4ebfdb72f75df274944 /tests/auto/qgeocameratiles | |
| parent | 8879bcdc41eb56aaf164d6b1e0d01b7aeceec460 (diff) | |
| download | qtlocation-5504a4c00ec01fdbc95a862c9bc63a680095daee.tar.gz | |
Rename QGeoProjection to QWebMercator
QGeoProjection is currently a class containing only static methods for
WebMercator conversion/interpolation.
This patch renames it to QWebMercator, effectively freeing the
QGeoProjection name for a real projection class
Change-Id: I15b71d04f7d1d21a1d26f46687ed33aa277f6deb
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests/auto/qgeocameratiles')
| -rw-r--r-- | tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp index 8d9cec3a..7a3ab513 100644 --- a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp +++ b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp @@ -33,7 +33,7 @@ #include "qgeocameradata_p.h" #include "qgeomaptype_p.h" -#include <QtPositioning/private/qgeoprojection_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #include <QtPositioning/private/qdoublevector2d_p.h> #include <QtTest/QtTest> #include <QtCore/QList> @@ -226,7 +226,7 @@ void tst_QGeoCameraTiles::tilesPositions() QGeoCameraData camera; camera.setZoomLevel(zoom); - camera.setCenter(QGeoProjection::mercatorToCoord(QDoubleVector2D(mercatorX, mercatorY))); + camera.setCenter(QWebMercator::mercatorToCoord(QDoubleVector2D(mercatorX, mercatorY))); QGeoCameraTiles ct; ct.setTileSize(16); |