diff options
author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-04-13 14:15:20 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-05-04 10:53:28 +0000 |
commit | e77eaa52d681bbc0591b3f294b40a0ccfeeac5e3 (patch) | |
tree | ef463c9417d6c4195ac377a4bf376ccf28983488 /src/plugins/geoservices/osm | |
parent | 72ecba08268ae8c080b411cfc5117ddcf9b6d0fe (diff) | |
download | qtlocation-e77eaa52d681bbc0591b3f294b40a0ccfeeac5e3.tar.gz |
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>
Diffstat (limited to 'src/plugins/geoservices/osm')
-rw-r--r-- | src/plugins/geoservices/osm/osm.pro | 8 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qgeotiledmaposm.cpp (renamed from src/plugins/geoservices/osm/qgeotiledmapdataosm.cpp) | 10 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qgeotiledmaposm.h (renamed from src/plugins/geoservices/osm/qgeotiledmapdataosm.h) | 12 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp | 10 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h | 2 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/plugins/geoservices/osm/osm.pro b/src/plugins/geoservices/osm/osm.pro index 5bfee3d0..a00f1fb8 100644 --- a/src/plugins/geoservices/osm/osm.pro +++ b/src/plugins/geoservices/osm/osm.pro @@ -8,7 +8,6 @@ load(qt_plugin) HEADERS += \ qgeoserviceproviderpluginosm.h \ qgeotiledmappingmanagerengineosm.h \ - qgeotiledmapdataosm.h \ qgeotilefetcherosm.h \ qgeomapreplyosm.h \ qgeocodingmanagerengineosm.h \ @@ -17,12 +16,12 @@ HEADERS += \ qgeoroutereplyosm.h \ qplacemanagerengineosm.h \ qplacesearchreplyosm.h \ - qplacecategoriesreplyosm.h + qplacecategoriesreplyosm.h \ + qgeotiledmaposm.h SOURCES += \ qgeoserviceproviderpluginosm.cpp \ qgeotiledmappingmanagerengineosm.cpp \ - qgeotiledmapdataosm.cpp \ qgeotilefetcherosm.cpp \ qgeomapreplyosm.cpp \ qgeocodingmanagerengineosm.cpp \ @@ -31,7 +30,8 @@ SOURCES += \ qgeoroutereplyosm.cpp \ qplacemanagerengineosm.cpp \ qplacesearchreplyosm.cpp \ - qplacecategoriesreplyosm.cpp + qplacecategoriesreplyosm.cpp \ + qgeotiledmaposm.cpp OTHER_FILES += \ diff --git a/src/plugins/geoservices/osm/qgeotiledmapdataosm.cpp b/src/plugins/geoservices/osm/qgeotiledmaposm.cpp index 211b087e..c2407d1d 100644 --- a/src/plugins/geoservices/osm/qgeotiledmapdataosm.cpp +++ b/src/plugins/geoservices/osm/qgeotiledmaposm.cpp @@ -31,23 +31,23 @@ ** ****************************************************************************/ -#include "qgeotiledmapdataosm.h" +#include "qgeotiledmaposm.h" #include "qgeotiledmappingmanagerengineosm.h" #include <QtLocation/private/qgeotilespec_p.h> QT_BEGIN_NAMESPACE -QGeoTiledMapDataOsm::QGeoTiledMapDataOsm(QGeoTiledMappingManagerEngineOsm *engine, QObject *parent) -: QGeoTiledMapData(engine, parent), m_mapId(-1) +QGeoTiledMapOsm::QGeoTiledMapOsm(QGeoTiledMappingManagerEngineOsm *engine, QObject *parent) +: QGeoTiledMap(engine, parent), m_mapId(-1) { } -QGeoTiledMapDataOsm::~QGeoTiledMapDataOsm() +QGeoTiledMapOsm::~QGeoTiledMapOsm() { } -void QGeoTiledMapDataOsm::evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) +void QGeoTiledMapOsm::evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) { if (visibleTiles.isEmpty()) return; diff --git a/src/plugins/geoservices/osm/qgeotiledmapdataosm.h b/src/plugins/geoservices/osm/qgeotiledmaposm.h index fbfae308..0314d9ae 100644 --- a/src/plugins/geoservices/osm/qgeotiledmapdataosm.h +++ b/src/plugins/geoservices/osm/qgeotiledmaposm.h @@ -31,21 +31,21 @@ ** ****************************************************************************/ -#ifndef QGEOTILEDMAPDATAOSM_H -#define QGEOTILEDMAPDATAOSM_H +#ifndef QGEOTILEDMAPOSM_H +#define QGEOTILEDMAPOSM_H -#include <QtLocation/private/qgeotiledmapdata_p.h> +#include <QtLocation/private/qgeotiledmap_p.h> QT_BEGIN_NAMESPACE class QGeoTiledMappingManagerEngineOsm; -class QGeoTiledMapDataOsm: public QGeoTiledMapData +class QGeoTiledMapOsm: public QGeoTiledMap { Q_OBJECT public: - QGeoTiledMapDataOsm(QGeoTiledMappingManagerEngineOsm *engine, QObject *parent = 0); - ~QGeoTiledMapDataOsm(); + QGeoTiledMapOsm(QGeoTiledMappingManagerEngineOsm *engine, QObject *parent = 0); + ~QGeoTiledMapOsm(); protected: void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) Q_DECL_OVERRIDE; diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp index 8fd3afb4..973a7437 100644 --- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp @@ -33,11 +33,11 @@ #include "qgeotiledmappingmanagerengineosm.h" #include "qgeotilefetcherosm.h" -#include "qgeotiledmapdataosm.h" +#include "qgeotiledmaposm.h" #include <QtLocation/private/qgeocameracapabilities_p.h> #include <QtLocation/private/qgeomaptype_p.h> -#include <QtLocation/private/qgeotiledmapdata_p.h> +#include <QtLocation/private/qgeotiledmap_p.h> QT_BEGIN_NAMESPACE @@ -52,7 +52,7 @@ QGeoTiledMappingManagerEngineOsm::QGeoTiledMappingManagerEngineOsm(const QVarian setTileSize(QSize(256, 256)); QList<QGeoMapType> mapTypes; - // See map type implementations in QGeoTiledMapDataOsm and QGeoTileFetcherOsm. + // See map type implementations in QGeoTiledMapOsm and QGeoTileFetcherOsm. mapTypes << QGeoMapType(QGeoMapType::StreetMap, tr("Street Map"), tr("Street map view in daylight mode"), false, false, 1); mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay, tr("Satellite Map"), tr("Satellite map view in daylight mode"), false, false, 2); mapTypes << QGeoMapType(QGeoMapType::CycleMap, tr("Cycle Map"), tr("Cycle map view in daylight mode"), false, false, 3); @@ -78,9 +78,9 @@ QGeoTiledMappingManagerEngineOsm::~QGeoTiledMappingManagerEngineOsm() { } -QGeoMap *QGeoTiledMappingManagerEngineOsm::createMapData() +QGeoMap *QGeoTiledMappingManagerEngineOsm::createMap() { - return new QGeoTiledMapDataOsm(this); + return new QGeoTiledMapOsm(this); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h index bb76ec20..fab4f483 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(); - QGeoMap *createMapData(); + QGeoMap *createMap(); }; QT_END_NAMESPACE |