QGeoMapScene renamed to QGeoTiledMapScenev5.7.0-alpha1

Since the class QGeoMapScene is tightly coupled to QGeoTiledMap, this
patch renames it into QGeoTiledMapScene/QGeoTiledMapScenePrivate, to
clarify the structure of the module and avoid confusion, as otherwise
it would not be clear that this class is exclusively used by QGeoTiledMap.

Change-Id: Ifd76b02ff14d0f0690dc37fcb0a93b0e0702d05d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

3 files changed, 11 insertions, 11 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 86abefd6..81013b2c 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -42,7 +42,7 @@ qtHaveModule(location) {
            qgeocodereply \
            qgeocodingmanager \
            qgeomaneuver \
-           qgeomapscene \
+           qgeotiledmapscene \
            qgeoroute \
            qgeoroutereply \
            qgeorouterequest \
diff --git a/tests/auto/qgeomapscene/qgeomapscene.pro b/tests/auto/qgeotiledmapscene/qgeotiledmapscene.pro
index 66eb72ea..c3ec6e91 100644
--- a/tests/auto/qgeomapscene/qgeomapscene.pro
+++ b/tests/auto/qgeotiledmapscene/qgeotiledmapscene.pro
@@ -1,8 +1,8 @@
 CONFIG += testcase
-TARGET = tst_qgeomapscene
+TARGET = tst_qgeotiledmapscene
 
 INCLUDEPATH += ../../../src/location/maps
 
-SOURCES += tst_qgeomapscene.cpp
+SOURCES += tst_qgeotiledmapscene.cpp
 
 QT += location positioning-private testlib
diff --git a/tests/auto/qgeomapscene/tst_qgeomapscene.cpp b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
index c6943650..3d43ebd8 100644
--- a/tests/auto/qgeomapscene/tst_qgeomapscene.cpp
+++ b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
@@ -29,7 +29,7 @@
 //TESTED_COMPONENT=src/location/maps
 
 #include "qgeotilespec_p.h"
-#include "qgeomapscene_p.h"
+#include "qgeotiledmapscene_p.h"
 #include "qgeocameratiles_p.h"
 #include "qgeocameradata_p.h"
 #include "qabstractgeotilecache_p.h"
@@ -47,7 +47,7 @@
 
 QT_USE_NAMESPACE
 
-class tst_QGeoMapScene : public QObject
+class tst_QGeoTiledMapScene : public QObject
 {
     Q_OBJECT
 
@@ -281,7 +281,7 @@ class tst_QGeoMapScene : public QObject
             ct.setCameraData(camera);
             ct.setScreenSize(QSize(16,16));
 
-            QGeoMapScene mapScene;
+            QGeoTiledMapScene mapScene;
             mapScene.setTileSize(16);
             mapScene.setScreenSize(QSize(16,16*32));
             mapScene.setCameraData(camera);
@@ -291,7 +291,7 @@ class tst_QGeoMapScene : public QObject
             QVERIFY(mapScene.verticalLock());
 
             // Test the case when setting vertical lock has no effect
-            QGeoMapScene mapScene2;
+            QGeoTiledMapScene mapScene2;
             mapScene2.setTileSize(16);
             mapScene2.setScreenSize(QSize(16,16));
             mapScene2.setCameraData(camera);
@@ -322,7 +322,7 @@ class tst_QGeoMapScene : public QObject
             ct.setCameraData(camera);
             ct.setScreenSize(QSize(screenWidth,screenHeight));
 
-            QGeoMapScene mapGeometry;
+            QGeoTiledMapScene mapGeometry;
             mapGeometry.setTileSize(tileSize);
             mapGeometry.setScreenSize(QSize(screenWidth,screenHeight));
             mapGeometry.setCameraData(camera);
@@ -361,7 +361,7 @@ class tst_QGeoMapScene : public QObject
             ct.setCameraData(camera);
             ct.setScreenSize(QSize(screenWidth,screenHeight));
 
-            QGeoMapScene mapGeometry;
+            QGeoTiledMapScene mapGeometry;
             mapGeometry.setTileSize(tileSize);
             mapGeometry.setScreenSize(QSize(screenWidth,screenHeight));
             mapGeometry.setCameraData(camera);
@@ -380,5 +380,5 @@ class tst_QGeoMapScene : public QObject
 
 };
 
-QTEST_GUILESS_MAIN(tst_QGeoMapScene)
-#include "tst_qgeomapscene.moc"
+QTEST_GUILESS_MAIN(tst_QGeoTiledMapScene)
+#include "tst_qgeotiledmapscene.moc"