From 986110e3a41b0e90ab55fa7d17ef12599c824b56 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@theqtcompany.com>
Date: Fri, 10 Apr 2015 18:59:31 +0200
Subject: Remove QGeoMapData class.

Since QGeoMap class does not have any subclasses, there is no
need for keeping the bridge in form of QGeoMapData.
This commit basically renames QGeoMapData to be QGeoMap.

Change-Id: I6eb2f56f7ea83663034f4a8297e8e8f7f185d6a9
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
---
 src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp | 2 +-
 src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h   | 2 +-
 src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp  | 2 +-
 src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h    | 2 +-
 src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp       | 2 +-
 src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/plugins/geoservices')

diff --git a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp
index 590f1b14..fd647159 100644
--- a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp
@@ -85,7 +85,7 @@ QGeoTiledMappingManagerEngineMapbox::~QGeoTiledMappingManagerEngineMapbox()
 {
 }
 
-QGeoMapData *QGeoTiledMappingManagerEngineMapbox::createMapData()
+QGeoMap *QGeoTiledMappingManagerEngineMapbox::createMapData()
 {
     return new QGeoTiledMapData(this, 0);
 }
diff --git a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h
index e0cd54c2..39876457 100644
--- a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h
@@ -52,7 +52,7 @@ public:
                                         QGeoServiceProvider::Error *error, QString *errorString);
     ~QGeoTiledMappingManagerEngineMapbox();
 
-    QGeoMapData *createMapData();
+    QGeoMap *createMapData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index 05fb85c5..e9ba1e8f 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -378,7 +378,7 @@ QString QGeoTiledMappingManagerEngineNokia::evaluateCopyrightsText(const QGeoMap
     return copyrightsText;
 }
 
-QGeoMapData *QGeoTiledMappingManagerEngineNokia::createMapData()
+QGeoMap *QGeoTiledMappingManagerEngineNokia::createMapData()
 {
     return new QGeoTiledMapDataNokia(this);
 }
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
index 12aa563f..819ed05e 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 QGeoMapData *createMapData();
+    virtual QGeoMap *createMapData();
     QString evaluateCopyrightsText(const QGeoMapType mapType,
                                    const qreal zoomLevel,
                                    const QSet<QGeoTileSpec> &tiles);
diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp
index 46a3cfd2..8fd3afb4 100644
--- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp
@@ -78,7 +78,7 @@ QGeoTiledMappingManagerEngineOsm::~QGeoTiledMappingManagerEngineOsm()
 {
 }
 
-QGeoMapData *QGeoTiledMappingManagerEngineOsm::createMapData()
+QGeoMap *QGeoTiledMappingManagerEngineOsm::createMapData()
 {
     return new QGeoTiledMapDataOsm(this);
 }
diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
index 25ffa511..bb76ec20 100644
--- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
@@ -49,7 +49,7 @@ public:
                                      QGeoServiceProvider::Error *error, QString *errorString);
     ~QGeoTiledMappingManagerEngineOsm();
 
-    QGeoMapData *createMapData();
+    QGeoMap *createMapData();
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.1