Set shorter name for class names with 'MapData'

Rename all references and files with 'MapData'
to use shorter name 'Map'.

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

6 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/geotestplugin/geotestplugin.pro b/tests/auto/geotestplugin/geotestplugin.pro
index 0945e4fe..9a4225e9 100644
--- a/tests/auto/geotestplugin/geotestplugin.pro
+++ b/tests/auto/geotestplugin/geotestplugin.pro
@@ -11,7 +11,7 @@ HEADERS += qgeocodingmanagerengine_test.h \
            qgeoroutingmanagerengine_test.h \
            qplacemanagerengine_test.h \
            qgeotiledmappingmanagerengine_test.h \
-           qgeotiledmapdata_test.h \
+           qgeotiledmap_test.h \
            qgeotilefetcher_test.h
 
 SOURCES += qgeoserviceproviderplugin_test.cpp
diff --git a/tests/auto/geotestplugin/qgeotiledmapdata_test.h b/tests/auto/geotestplugin/qgeotiledmap_test.h
index ac96c111..bf1d5074 100644
--- a/tests/auto/geotestplugin/qgeotiledmapdata_test.h
+++ b/tests/auto/geotestplugin/qgeotiledmap_test.h
@@ -31,20 +31,20 @@
 **
 ****************************************************************************/
 
-#ifndef QGEOTILEDMAPDATA_TEST_H
-#define QGEOTILEDMAPDATA_TEST_H
+#ifndef QGEOTILEDMAP_TEST_H
+#define QGEOTILEDMAP_TEST_H
 
-#include <QtLocation/private/qgeotiledmapdata_p.h>
+#include <QtLocation/private/qgeotiledmap_p.h>
 
 QT_USE_NAMESPACE
 
 
-class QGeoTiledMapDataTest: public QGeoTiledMapData
+class QGeoTiledMapTest: public QGeoTiledMap
 {
     Q_OBJECT
 public:
-    QGeoTiledMapDataTest(QGeoTiledMappingManagerEngine *engine, QObject *parent = 0)
-        : QGeoTiledMapData(engine, parent) {}
+    QGeoTiledMapTest(QGeoTiledMappingManagerEngine *engine, QObject *parent = 0)
+        : QGeoTiledMap(engine, parent) {}
 
 };
 
diff --git a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
index d690c63d..3751a845 100644
--- a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
@@ -41,7 +41,7 @@
 #include <QtLocation/private/qgeomaptype_p.h>
 #include <QtLocation/private/qgeocameracapabilities_p.h>
 
-#include "qgeotiledmapdata_test.h"
+#include "qgeotiledmap_test.h"
 #include "qgeotilefetcher_test.h"
 
 QT_USE_NAMESPACE
@@ -72,9 +72,9 @@ public:
         setTileFetcher(fetcher);
     }
 
-    QGeoMap *createMapData()
+    QGeoMap *createMap()
     {
-        return new QGeoTiledMapDataTest(this);;
+        return new QGeoTiledMapTest(this);;
     }
 
 };
diff --git a/tests/auto/qgeocameracapabilities/tst_qgeocameracapabilities.cpp b/tests/auto/qgeocameracapabilities/tst_qgeocameracapabilities.cpp
index fdfd8b3d..a219a31f 100644
--- a/tests/auto/qgeocameracapabilities/tst_qgeocameracapabilities.cpp
+++ b/tests/auto/qgeocameracapabilities/tst_qgeocameracapabilities.cpp
@@ -35,7 +35,7 @@
 #include <QtTest/QtTest>
 
 #include "qgeocameracapabilities_p.h"
-#include "qgeotiledmapdata_p.h"
+#include "qgeotiledmap_p.h"
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qgeomapcontroller/qgeomapcontroller.pro b/tests/auto/qgeomapcontroller/qgeomapcontroller.pro
index 8f5827b9..c467d473 100644
--- a/tests/auto/qgeomapcontroller/qgeomapcontroller.pro
+++ b/tests/auto/qgeomapcontroller/qgeomapcontroller.pro
@@ -3,7 +3,7 @@ CONFIG += testcase
 TARGET = tst_qgeomapcontroller
 
 HEADERS += ../geotestplugin/qgeoserviceproviderplugin_test.h \
-           ../geotestplugin/qgeotiledmapdata_test.h \
+           ../geotestplugin/qgeotiledmap_test.h \
            ../geotestplugin/qgeotiledmappingmanagerengine_test.h \
            ../geotestplugin/qplacemanagerengine_test.h \
            ../geotestplugin/qgeotilefetcher_test.h \
diff --git a/tests/auto/qgeomapcontroller/tst_qgeomapcontroller.cpp b/tests/auto/qgeomapcontroller/tst_qgeomapcontroller.cpp
index dcd6d794..de7ae3fe 100644
--- a/tests/auto/qgeomapcontroller/tst_qgeomapcontroller.cpp
+++ b/tests/auto/qgeomapcontroller/tst_qgeomapcontroller.cpp
@@ -41,7 +41,7 @@
 // cross-reference test plugin, where concrete subclasses are needed
 // in order to create a concrete mapcontroller
 #include "../geotestplugin/qgeoserviceproviderplugin_test.h"
-#include "../geotestplugin/qgeotiledmapdata_test.h"
+#include "../geotestplugin/qgeotiledmap_test.h"
 #include "../geotestplugin/qgeotiledmappingmanagerengine_test.h"
 
 QT_USE_NAMESPACE
@@ -55,7 +55,7 @@ public:
     ~tst_QGeoMapController();
 
 private:
-    QGeoTiledMapDataTest *map_;
+    QGeoTiledMapTest *map_;
     QSignalSpy *signalCenterChanged_;
     QSignalSpy *signalBearingChanged_;
     QSignalSpy *signalTiltChanged_;
@@ -79,7 +79,7 @@ tst_QGeoMapController::tst_QGeoMapController()
 {
     // unlike low level classes, geomapcontroller is built up from several parent classes
     // so, in order to test it, we need to create these parent classes for it to link to
-    // such as a GeoMapData
+    // such as a GeoMap
     QGeoServiceProviderFactoryTest serviceProviderTest; // empty constructor
 
     // TODO: check whether the default constructors of these objects allow the create to work
@@ -88,7 +88,7 @@ tst_QGeoMapController::tst_QGeoMapController()
     QString mappingErrorString;
 
     QGeoTiledMappingManagerEngineTest *mapEngine = static_cast<QGeoTiledMappingManagerEngineTest*>(serviceProviderTest.createMappingManagerEngine(parameterMap, &mappingError, &mappingErrorString));
-    map_ = new QGeoTiledMapDataTest(mapEngine);
+    map_ = new QGeoTiledMapTest(mapEngine);
     map_->resize(100, 100);