From 5504a4c00ec01fdbc95a862c9bc63a680095daee Mon Sep 17 00:00:00 2001
From: Paolo Angelelli <paolo.angelelli@qt.io>
Date: Fri, 2 Dec 2016 16:02:31 +0100
Subject: 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>
---
 tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp     | 4 ++--
 tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp           | 3 ++-
 tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'tests')

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);
diff --git a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
index cc2672b2..e4ecfae9 100644
--- a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
+++ b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
@@ -37,6 +37,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 #include <QtTest/QSignalSpy>
+#include <QtPositioning/private/qwebmercator_p.h>
 #include <QtLocation/QGeoServiceProvider>
 #include <QtLocation/private/qgeotiledmap_p.h>
 #include <QtLocation/private/qgeomappingmanager_p.h>
@@ -126,7 +127,7 @@ void tst_QGeoTiledMap::fetchTiles()
     m_map->setPrefetchStyle(style);
 
     QGeoCameraData camera;
-    camera.setCenter(QGeoProjection::mercatorToCoord(QDoubleVector2D( 0.5 ,  0.5 )));
+    camera.setCenter(QWebMercator::mercatorToCoord(QDoubleVector2D( 0.5 ,  0.5 )));
 
     //prev_visible
     camera.setZoomLevel(zoomLevel-1);
diff --git a/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
index c304c905..0935c3f7 100644
--- a/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
+++ b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
@@ -34,7 +34,7 @@
 #include "qgeocameradata_p.h"
 #include "qabstractgeotilecache_p.h"
 
-#include <QtPositioning/private/qgeoprojection_p.h>
+#include <QtPositioning/private/qwebmercator_p.h>
 #include <QtPositioning/private/qdoublevector2d_p.h>
 
 #include <qtest.h>
@@ -303,7 +303,7 @@ class tst_QGeoTiledMapScene : public QObject
 
             QGeoCameraData camera;
             camera.setZoomLevel(zoom);
-            QGeoCoordinate centerCoordinate = QGeoProjection::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY));
+            QGeoCoordinate centerCoordinate = QWebMercator::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY));
             camera.setCenter(centerCoordinate);
 
             QGeoCameraTiles ct;
@@ -344,7 +344,7 @@ class tst_QGeoTiledMapScene : public QObject
 
             QGeoCameraData camera;
             camera.setZoomLevel(zoom);
-            QGeoCoordinate coord = QGeoProjection::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY));
+            QGeoCoordinate coord = QWebMercator::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY));
             camera.setCenter(coord);
 
             QGeoCameraTiles ct;
-- 
cgit v1.2.1