diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp index f0b98db9563224265c9540572bf5a845838bd83e..6495f1c1855b5c3ee82829d65a279b43a824ebe4 100644 --- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp +++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp @@ -50,28 +50,18 @@ #include #include -#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) -#include -#else #include -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) #include -#else -#include -#endif -#endif #include #include -#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) //----------------------------------------------------------------------------- QGeoTiledMapQGC::QGeoTiledMapQGC(QGeoTiledMappingManagerEngine *engine, QObject *parent) : QGeoTiledMap(engine, parent) { } -#endif //----------------------------------------------------------------------------- QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) @@ -86,15 +76,7 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian setTileSize(QSize(256, 256)); - // In Qt 5.10 QGeoMapType need QGeoCameraCapabilities as argument - // E.g: https://github.com/qt/qtlocation/blob/2b230b0a10d898979e9d5193f4da2e408b397fe3/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp#L167 - #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) #define QGCGEOMAPTYPE(a,b,c,d,e,f) QGeoMapType(a,b,c,d,e,f,QByteArray("QGroundControl"), cameraCaps) - #elif QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) - #define QGCGEOMAPTYPE(a,b,c,d,e,f) QGeoMapType(a,b,c,d,e,f,QByteArray("QGroundControl")) - #else - #define QGCGEOMAPTYPE(a,b,c,d,e,f) QGeoMapType(a,b,c,d,e,f) - #endif /* * Google and Bing don't seem kosher at all. This was based on original code from OpenPilot and heavily modified to be used in QGC. @@ -117,9 +99,7 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian getQGCMapEngine()->setUserAgent(parameters.value(QStringLiteral("useragent")).toString().toLatin1()); } -#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) _setCache(parameters); -#endif setTileFetcher(new QGeoTileFetcherQGC(this)); @@ -132,16 +112,6 @@ QGeoTiledMappingManagerEngineQGC::~QGeoTiledMappingManagerEngineQGC() { } -#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) - -//----------------------------------------------------------------------------- -QGeoMapData *QGeoTiledMappingManagerEngineQGC::createMapData() -{ - return new QGeoTiledMapData(this, 0); -} - -#else - //----------------------------------------------------------------------------- QGeoMap* QGeoTiledMappingManagerEngineQGC::createMap() @@ -149,9 +119,6 @@ QGeoTiledMappingManagerEngineQGC::createMap() return new QGeoTiledMapQGC(this); } -#endif - -#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) //----------------------------------------------------------------------------- void QGeoTiledMappingManagerEngineQGC::_setCache(const QVariantMap ¶meters) @@ -194,12 +161,8 @@ QGeoTiledMappingManagerEngineQGC::_setCache(const QVariantMap ¶meters) if(memLimit > 1024 * 1024 * 1024) memLimit = 1024 * 1024 * 1024; //-- Disable Qt's disk cache (sort of) -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) QAbstractGeoTileCache *pTileCache = new QGeoFileTileCache(cacheDir); setTileCache(pTileCache); -#else - QGeoTileCache* pTileCache = createTileCacheWithDir(cacheDir); -#endif if(pTileCache) { //-- We're basically telling it to use 100k of disk for cache. It doesn't like @@ -209,4 +172,3 @@ QGeoTiledMappingManagerEngineQGC::_setCache(const QVariantMap ¶meters) pTileCache->setMaxMemoryUsage(memLimit); } } -#endif diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h index 6fce5656f8fa0115314d89e6bdb493923d327190..4980f2181819f21d250cb1fa8326ecb005d80682 100644 --- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h +++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h @@ -48,19 +48,15 @@ #define QGEOTILEDMAPPINGMANAGERENGINEQGC_H #include -#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) #include -#endif #include -#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) class QGeoTiledMapQGC : public QGeoTiledMap { Q_OBJECT public: QGeoTiledMapQGC(QGeoTiledMappingManagerEngine *engine, QObject *parent = 0); }; -#endif class QGeoTileFetcherQGC; @@ -70,15 +66,10 @@ class QGeoTiledMappingManagerEngineQGC : public QGeoTiledMappingManagerEngine public: QGeoTiledMappingManagerEngineQGC(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QGeoTiledMappingManagerEngineQGC(); -#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) - QGeoMapData *createMapData(); -#else QGeoMap *createMap(); -#endif + private: -#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) void _setCache(const QVariantMap ¶meters); -#endif }; #endif // QGEOTILEDMAPPINGMANAGERENGINEQGC_H