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, 23 insertions, 23 deletions

diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro
index 1e69d4d6..62b04870 100644
--- a/src/plugins/geoservices/nokia/nokia.pro
+++ b/src/plugins/geoservices/nokia/nokia.pro
@@ -17,7 +17,6 @@ HEADERS += \
             qgeocodingmanagerengine_nokia.h \
             qgeotiledmappingmanagerengine_nokia.h \
             qgeotilefetcher_nokia.h \
-            qgeotiledmapdata_nokia.h \
             qgeomapreply_nokia.h \
             qgeoroutereply_nokia.h \
             qgeoroutexmlparser.h \
@@ -29,7 +28,8 @@ HEADERS += \
             qgeouriprovider.h \
             uri_constants.h \
             qgeoerror_messages.h \
-            qgeomapversion.h
+            qgeomapversion.h \
+            qgeotiledmap_nokia.h
 
 
 SOURCES += \
@@ -38,7 +38,6 @@ SOURCES += \
             qgeocodingmanagerengine_nokia.cpp \
             qgeotiledmappingmanagerengine_nokia.cpp \
             qgeotilefetcher_nokia.cpp \
-            qgeotiledmapdata_nokia.cpp \
             qgeomapreply_nokia.cpp \
             qgeoroutereply_nokia.cpp \
             qgeoroutexmlparser.cpp \
@@ -48,7 +47,8 @@ SOURCES += \
             qgeouriprovider.cpp \
             uri_constants.cpp \
             qgeoerror_messages.cpp \
-            qgeomapversion.cpp
+            qgeomapversion.cpp \
+            qgeotiledmap_nokia.cpp
 
 include(placesv2/placesv2.pri)
 
diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp
index ec507d99..fa8a7831 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp
@@ -34,7 +34,7 @@
  **
  ****************************************************************************/
 
-#include "qgeotiledmapdata_nokia.h"
+#include "qgeotiledmap_nokia.h"
 #include "qgeotiledmappingmanagerengine_nokia.h"
 #include "qgeomapcontroller_p.h"
 
@@ -54,14 +54,14 @@ QT_BEGIN_NAMESPACE
  Constructs a new tiled map data object, which stores the map data required by
  \a geoMap and makes use of the functionality provided by \a engine.
  */
-QGeoTiledMapDataNokia::QGeoTiledMapDataNokia(QGeoTiledMappingManagerEngineNokia *engine, QObject *parent /*= 0*/) :
-    QGeoTiledMapData(engine, parent),
+QGeoTiledMapNokia::QGeoTiledMapNokia(QGeoTiledMappingManagerEngineNokia *engine, QObject *parent /*= 0*/) :
+    QGeoTiledMap(engine, parent),
     logo(":/images/logo.png") // HERE logo image
 {}
 
-QGeoTiledMapDataNokia::~QGeoTiledMapDataNokia() {}
+QGeoTiledMapNokia::~QGeoTiledMapNokia() {}
 
-void QGeoTiledMapDataNokia::evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles)
+void QGeoTiledMapNokia::evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles)
 {
     const int spaceToLogo = 4;
     const int blurRate = 1;
@@ -107,7 +107,7 @@ void QGeoTiledMapDataNokia::evaluateCopyrights(const QSet<QGeoTileSpec> &visible
     emit copyrightsChanged(copyrightsSlab);
 }
 
-int QGeoTiledMapDataNokia::mapVersion()
+int QGeoTiledMapNokia::mapVersion()
 {
     QGeoTiledMappingManagerEngineNokia *engineNokia = static_cast<QGeoTiledMappingManagerEngineNokia *>(engine());
     return engineNokia->mapVersion();
diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h
index fa52465e..776c9322 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h
@@ -34,10 +34,10 @@
 **
 ****************************************************************************/
 
-#ifndef QGEOMAPDATA_NOKIA_H
-#define QGEOMAPDATA_NOKIA_H
+#ifndef QGEOMAP_NOKIA_H
+#define QGEOMAP_NOKIA_H
 
-#include "qgeotiledmapdata_p.h"
+#include "qgeotiledmap_p.h"
 #include <QImage>
 #include <QSize>
 
@@ -45,12 +45,12 @@ QT_BEGIN_NAMESPACE
 
 class QGeoTiledMappingManagerEngineNokia;
 
-class QGeoTiledMapDataNokia: public QGeoTiledMapData
+class QGeoTiledMapNokia: public QGeoTiledMap
 {
 Q_OBJECT
 public:
-    QGeoTiledMapDataNokia(QGeoTiledMappingManagerEngineNokia *engine, QObject *parent = 0);
-    ~QGeoTiledMapDataNokia();
+    QGeoTiledMapNokia(QGeoTiledMappingManagerEngineNokia *engine, QObject *parent = 0);
+    ~QGeoTiledMapNokia();
 
     QString getViewCopyright();
     void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles);
@@ -58,7 +58,7 @@ public:
 
 
 private:
-    Q_DISABLE_COPY(QGeoTiledMapDataNokia)
+    Q_DISABLE_COPY(QGeoTiledMapNokia)
 
     QImage logo;
     QImage copyrightsSlab;
@@ -67,4 +67,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QGEOMAPDATA_NOKIA_H
+#endif // QGEOMAP_NOKIA_H
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index e9ba1e8f..f96e0a74 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -36,7 +36,7 @@
 
 #include "qgeocameracapabilities_p.h"
 #include "qgeotiledmappingmanagerengine_nokia.h"
-#include "qgeotiledmapdata_nokia.h"
+#include "qgeotiledmap_nokia.h"
 #include "qgeotilefetcher_nokia.h"
 #include "qgeotilespec_p.h"
 #include "qgeotilecache_p.h"
@@ -378,9 +378,9 @@ QString QGeoTiledMappingManagerEngineNokia::evaluateCopyrightsText(const QGeoMap
     return copyrightsText;
 }
 
-QGeoMap *QGeoTiledMappingManagerEngineNokia::createMapData()
+QGeoMap *QGeoTiledMappingManagerEngineNokia::createMap()
 {
-    return new QGeoTiledMapDataNokia(this);
+    return new QGeoTiledMapNokia(this);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
index 819ed05e..acaf61d7 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
@@ -65,7 +65,7 @@ public:
                                        QString *errorString);
     ~QGeoTiledMappingManagerEngineNokia();
 
-    virtual QGeoMap *createMapData();
+    virtual QGeoMap *createMap();
     QString evaluateCopyrightsText(const QGeoMapType mapType,
                                    const qreal zoomLevel,
                                    const QSet<QGeoTileSpec> &tiles);
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index 7a93b940..0e76fbdf 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -36,7 +36,7 @@
 
 #include "qgeotilefetcher_nokia.h"
 #include "qgeomapreply_nokia.h"
-#include "qgeotiledmapdata_nokia.h"
+#include "qgeotiledmap_nokia.h"
 #include "qgeotiledmappingmanagerengine_nokia.h"
 #include "qgeonetworkaccessmanager.h"
 #include "qgeouriprovider.h"