diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-03-26 14:26:23 +0200 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-06 15:23:28 +0000 |
commit | 98878f5a25578c66b001c27817bffac6e0f82d20 (patch) | |
tree | 1aba2e5df65e7a68b325cef49276270afa852b96 /src/location/maps/qgeotiledmappingmanagerengine_p.h | |
parent | 30f549fce76ec7d62234f618decce38d3ef1c475 (diff) | |
download | qtlocation-98878f5a25578c66b001c27817bffac6e0f82d20.tar.gz |
Allow threaded tile provisioning
This change virtualizes four key methods of QGeoTiledMappingManagerEngine,
that need to be reimplemented in order to be able to run tile provisioning
in a separate thread.
QGeoTileRequestManager is also now privately exported, as it has to be
used in those methods.
Finally the patch includes some minor cleanup in QGeoTileFetcher.
Change-Id: I3063263120f935f0cde54abf00bd1caa476ab215
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/maps/qgeotiledmappingmanagerengine_p.h')
-rw-r--r-- | src/location/maps/qgeotiledmappingmanagerengine_p.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h index a7b4b1d0..3455655f 100644 --- a/src/location/maps/qgeotiledmappingmanagerengine_p.h +++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h @@ -82,19 +82,18 @@ public: QSize tileSize() const; int tileVersion() const; - void updateTileRequests(QGeoTiledMap *map, + virtual void updateTileRequests(QGeoTiledMap *map, const QSet<QGeoTileSpec> &tilesAdded, const QSet<QGeoTileSpec> &tilesRemoved); QAbstractGeoTileCache *tileCache(); - QSharedPointer<QGeoTileTexture> getTileTexture(const QGeoTileSpec &spec); - + virtual QSharedPointer<QGeoTileTexture> getTileTexture(const QGeoTileSpec &spec); QAbstractGeoTileCache::CacheAreas cacheHint() const; private Q_SLOTS: - void engineTileFinished(const QGeoTileSpec &spec, const QByteArray &bytes, const QString &format); - void engineTileError(const QGeoTileSpec &spec, const QString &errorString); + virtual void engineTileFinished(const QGeoTileSpec &spec, const QByteArray &bytes, const QString &format); + virtual void engineTileError(const QGeoTileSpec &spec, const QString &errorString); Q_SIGNALS: void tileError(const QGeoTileSpec &spec, const QString &errorString); @@ -108,7 +107,6 @@ protected: void setTileCache(QAbstractGeoTileCache *cache); QGeoTiledMap::PrefetchStyle m_prefetchStyle; -private: QGeoTiledMappingManagerEnginePrivate *d_ptr; Q_DECLARE_PRIVATE(QGeoTiledMappingManagerEngine) |