Add virtual QGeoMap::removeMapObject

this can be called in ~QGeoMapObjectPrivate overrides to delete
themselves from the map.

Change-Id: I715491728a60b3d1bd60944a51dfa0ba07a3b29e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

2 files changed, 9 insertions, 0 deletions

diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index 58657143..5f125169 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -290,6 +290,13 @@ bool QGeoMap::createMapObjectImplementation(QGeoMapObject *obj)
     return false;
 }
 
+/*!
+    To be called in ~QGeoMapObjectPrivate overrides, if needed
+*/
+void QGeoMap::removeMapObject(QGeoMapObject * /*obj*/)
+{
+}
+
 QList<QGeoMapObject *> QGeoMap::mapObjects() const
 {
     Q_D(const QGeoMap);
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h
index 8e4a8839..e67340be 100644
--- a/src/location/maps/qgeomap_p.h
+++ b/src/location/maps/qgeomap_p.h
@@ -157,6 +157,7 @@ protected:
     void setCameraData(const QGeoCameraData &cameraData);
     void setCameraCapabilities(const QGeoCameraCapabilities &cameraCapabilities);
     virtual QSGNode *updateSceneGraph(QSGNode *node, QQuickWindow *window) = 0;
+    virtual void removeMapObject(QGeoMapObject *obj);
 
 Q_SIGNALS:
     void cameraDataChanged(const QGeoCameraData &cameraData);
@@ -170,6 +171,7 @@ Q_SIGNALS:
 private:
     Q_DISABLE_COPY(QGeoMap)
     friend class QDeclarativeGeoMap; //updateSceneGraph
+    friend class QGeoMapPrivate;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoMap::ItemTypes)