diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-04-28 14:00:39 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-05-21 08:13:17 +0000 |
| commit | 3c674e0ec3fcbb1acebd27580ef005d7f6726719 (patch) | |
| tree | 970902e2baa57b31bd2851ec1b987e4f70eeb4b1 /src/location/maps/qgeotiledmap_p_p.h | |
| parent | 52b887a8004029cf18942b5d16b1dcf396feabc0 (diff) | |
| download | qtlocation-3c674e0ec3fcbb1acebd27580ef005d7f6726719.tar.gz | |
Fix missing guarded pointers for mapping engine
Since mapping engine is going to be destroyed
on geoseriveprovider change/plugin unload use
QPointer to track engine existence before
making calls.
This commit refactors a bit QGeoTileRequestManager
to handle all the calls to the enigne. Check for
null pointer before calling the engine. Move
registerMap method to base class.
Update QGeoTiledMapNokia class accordingly.
Change-Id: I886e85e660b2c515e4a617e98e9cc0c3c13781b6
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/location/maps/qgeotiledmap_p_p.h')
| -rw-r--r-- | src/location/maps/qgeotiledmap_p_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/location/maps/qgeotiledmap_p_p.h b/src/location/maps/qgeotiledmap_p_p.h index 4c69efe9..bd4b4c05 100644 --- a/src/location/maps/qgeotiledmap_p_p.h +++ b/src/location/maps/qgeotiledmap_p_p.h @@ -81,7 +81,7 @@ public: QGeoCoordinate itemPositionToCoordinate(const QDoubleVector2D &pos) const; QDoubleVector2D coordinateToItemPosition(const QGeoCoordinate &coordinate) const; - void newTileFetched(const QGeoTileSpec &spec); + void updateTile(const QGeoTileSpec &spec); void prefetchTiles(); protected: @@ -91,9 +91,6 @@ protected: private: QGeoTileCache *m_cache; - //TODO: fix base pointer - QPointer<QGeoTiledMappingManagerEngine> m_engine; - QGeoCameraTiles *m_cameraTiles; QGeoMapScene *m_mapScene; QGeoTileRequestManager *m_tileRequests; |