diff options
Diffstat (limited to 'src/plugins/geoservices')
4 files changed, 21 insertions, 21 deletions
diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp index df94c263..efc8c357 100644 --- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp @@ -49,7 +49,7 @@ #include "qgeomappingmanagerengine_nokia.h" #include "qgeomapreply_nokia.h" -#include <tilespec.h> +#include <qgeotilespec.h> #include <QNetworkAccessManager> #include <QNetworkDiskCache> @@ -97,18 +97,18 @@ void QGeoMappingManagerEngineNokia::init() { setTileSize(QSize(256, 256)); - QList<MapType> types; - types << MapType(MapType::StreetMap,tr("Street Map"),tr("Nokia Street Map"), false, 1); - types << MapType(MapType::SatelliteMapDay,tr("Satellite Map(day)"),tr("Nokia Satellite Map (day)"), false, 2); - types << MapType(MapType::TerrainMap,tr("Terrain Map"),tr("Nokia Terrain Map"), false, 3); - types << MapType(MapType::HybridMap,tr("Hybrid Map"),tr("Nokia Hybrid Map"), false, 4); - types << MapType(MapType::TransitMap,tr("Transit Map"),tr("Nokia Transit Map"), false, 5); - types << MapType(MapType::GrayStreetMap,tr("Gray Street Map"),tr("Nokia Gray Street Map"), false, 6); - types << MapType(MapType::StreetMap,tr("Mobile Street Map"),tr("Nokia Mobile Street Map"), true, 7); - types << MapType(MapType::TerrainMap,tr("Mobile Terrain Map"),tr("Nokia Mobile Terrain Map"), true, 8); - types << MapType(MapType::HybridMap,tr("Mobile Hybrid Map"),tr("Nokia Mobile Hybrid Map"), true, 9); - types << MapType(MapType::TransitMap,tr("Mobile Transit Map"),tr("Nokia Mobile Transit Map"), true, 10); - types << MapType(MapType::GrayStreetMap,tr("Mobile Gray Street Map"),tr("Nokia Mobile Gray Street Map"), true, 11); + QList<QGeoMapType> types; + types << QGeoMapType(QGeoMapType::StreetMap,tr("Street Map"),tr("Nokia Street Map"), false, 1); + types << QGeoMapType(QGeoMapType::SatelliteMapDay,tr("Satellite Map(day)"),tr("Nokia Satellite Map (day)"), false, 2); + types << QGeoMapType(QGeoMapType::TerrainMap,tr("Terrain Map"),tr("Nokia Terrain Map"), false, 3); + types << QGeoMapType(QGeoMapType::HybridMap,tr("Hybrid Map"),tr("Nokia Hybrid Map"), false, 4); + types << QGeoMapType(QGeoMapType::TransitMap,tr("Transit Map"),tr("Nokia Transit Map"), false, 5); + types << QGeoMapType(QGeoMapType::GrayStreetMap,tr("Gray Street Map"),tr("Nokia Gray Street Map"), false, 6); + types << QGeoMapType(QGeoMapType::StreetMap,tr("Mobile Street Map"),tr("Nokia Mobile Street Map"), true, 7); + types << QGeoMapType(QGeoMapType::TerrainMap,tr("Mobile Terrain Map"),tr("Nokia Mobile Terrain Map"), true, 8); + types << QGeoMapType(QGeoMapType::HybridMap,tr("Mobile Hybrid Map"),tr("Nokia Mobile Hybrid Map"), true, 9); + types << QGeoMapType(QGeoMapType::TransitMap,tr("Mobile Transit Map"),tr("Nokia Mobile Transit Map"), true, 10); + types << QGeoMapType(QGeoMapType::GrayStreetMap,tr("Mobile Gray Street Map"),tr("Nokia Mobile Gray Street Map"), true, 11); setSupportedMapTypes(types); // QList<QGraphicsGeoMap::ConnectivityMode> modes; @@ -207,7 +207,7 @@ void QGeoMappingManagerEngineNokia::init() QGeoMappingManagerEngine::init(); } -QGeoTiledMapReply* QGeoMappingManagerEngineNokia::getTileImage(const TileSpec &spec) +QGeoTiledMapReply* QGeoMappingManagerEngineNokia::getTileImage(const QGeoTileSpec &spec) { // TODO add error detection for if request.connectivityMode() != QGraphicsGeoMap::OnlineMode QString rawRequest = getRequestString(spec); @@ -230,7 +230,7 @@ QGeoTiledMapReply* QGeoMappingManagerEngineNokia::getTileImage(const TileSpec &s return mapReply; } -QString QGeoMappingManagerEngineNokia::getRequestString(const TileSpec &spec) const +QString QGeoMappingManagerEngineNokia::getRequestString(const QGeoTileSpec &spec) const { const char subdomain = m_maxSubdomains ? m_firstSubdomain.toAscii() + (spec.x() + spec.y()) % m_maxSubdomains : 0; diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h index 9c11ed0e..a0f1d458 100644 --- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h @@ -64,7 +64,7 @@ class QNetworkAccessManager; class QNetworkDiskCache; class QGeoTiledMapReply; -class TileSpec; +class QGeoTileSpec; class QGeoMappingManagerEngineNokia : public QGeoMappingManagerEngine { @@ -77,7 +77,7 @@ public: void init(); - QGeoTiledMapReply* getTileImage(const TileSpec &spec); + QGeoTiledMapReply* getTileImage(const QGeoTileSpec &spec); const QString& host() const; QChar firstSubdomain() const; @@ -94,7 +94,7 @@ private Q_SLOTS: private: Q_DISABLE_COPY(QGeoMappingManagerEngineNokia) - QString getRequestString(const TileSpec &spec) const; + QString getRequestString(const QGeoTileSpec &spec) const; static QString sizeToStr(const QSize &size); static QString mapIdToStr(int mapId); diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp index 3471304b..697a44bd 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const TileSpec &spec, QObject *parent) +QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent) : QGeoTiledMapReply(spec, parent), m_reply(reply) { diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h index bb95f4a7..6dce1964 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h @@ -49,7 +49,7 @@ #ifndef QGEOMAPREPLY_NOKIA_H #define QGEOMAPREPLY_NOKIA_H -#include <tilespec.h> +#include <qgeotilespec.h> #include <qgeotiledmapreply.h> #include <QNetworkReply> @@ -60,7 +60,7 @@ class QGeoMapReplyNokia : public QGeoTiledMapReply Q_OBJECT public: - QGeoMapReplyNokia(QNetworkReply *reply, const TileSpec &spec, QObject *parent = 0); + QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = 0); ~QGeoMapReplyNokia(); void abort(); |