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>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index d6f80db9..6cc4caea 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -72,10 +72,9 @@ public:
 
     QGeoTileFetcher *tileFetcher();
 
-    virtual QGeoMap *createMap();
-
-    void registerMap(QGeoTiledMap *map);
-    void deregisterMap(QGeoTiledMap *map);
+    QGeoMap *createMap() Q_DECL_OVERRIDE;
+    void registerMap(QGeoMap *map) Q_DECL_OVERRIDE;
+    void deregisterMap(QGeoMap *map) Q_DECL_OVERRIDE;
 
     QSize tileSize() const;