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 | |
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')
13 files changed, 48 insertions, 48 deletions
diff --git a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp index fd647159..4be5ac24 100644 --- a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp @@ -39,7 +39,7 @@ #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 @@ -85,9 +85,9 @@ QGeoTiledMappingManagerEngineMapbox::~QGeoTiledMappingManagerEngineMapbox() { } -QGeoMap *QGeoTiledMappingManagerEngineMapbox::createMapData() +QGeoMap *QGeoTiledMappingManagerEngineMapbox::createMap() { - return new QGeoTiledMapData(this, 0); + return new QGeoTiledMap(this, 0); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h index 39876457..379ca6b8 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(); - QGeoMap *createMapData(); + QGeoMap *createMap(); }; QT_END_NAMESPACE 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" 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 |