summaryrefslogtreecommitdiffstats
path: root/src/location/declarativemaps/qdeclarativegeomap_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomap_p.h')
-rw-r--r--src/location/declarativemaps/qdeclarativegeomap_p.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h
index 5c568d8f..27ee9822 100644
--- a/src/location/declarativemaps/qdeclarativegeomap_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomap_p.h
@@ -175,6 +175,12 @@ public:
Q_INVOKABLE void clearMapParameters();
QList<QObject *> mapParameters();
+ void addMapObject(QGeoMapObject *object);
+ void removeMapObject(QGeoMapObject *object);
+ void clearMapObjects();
+ QList<QGeoMapObject *> mapObjects();
+
+
Q_INVOKABLE QGeoCoordinate toCoordinate(const QPointF &position, bool clipToViewPort = true) const;
Q_INVOKABLE QPointF fromCoordinate(const QGeoCoordinate &coordinate, bool clipToViewPort = true) const;
@@ -188,6 +194,7 @@ public:
QString errorString() const;
QGeoServiceProvider::Error error() const;
+ QGeoMap* map() const;
Q_SIGNALS:
void pluginChanged(QDeclarativeGeoServiceProvider *plugin);
@@ -212,6 +219,7 @@ Q_SIGNALS:
void copyrightsChanged(const QImage &copyrightsImage);
void copyrightsChanged(const QString &copyrightsHtml);
void mapReadyChanged(bool ready);
+ void mapObjectsChanged();
protected:
void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE ;
@@ -273,6 +281,7 @@ private:
double m_maximumViewportLatitude;
bool m_initialized;
QList<QDeclarativeGeoMapParameter *> m_mapParameters;
+ QList<QGeoMapObject*> m_pendingMapObjects; // Used only in the initialization phase
QGeoCameraCapabilities m_cameraCapabilities;
qreal m_userMinimumZoomLevel;
qreal m_userMaximumZoomLevel;