summaryrefslogtreecommitdiff
path: root/platform/qt/include/qmapboxgl.hpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-09-14 14:58:36 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-09-26 11:47:34 +0200
commit1ce6e1b4bb164a9735742b0cf3f63b7417bc96ae (patch)
tree998bedafb64f9567c786d4e13e6f52c67ec2d348 /platform/qt/include/qmapboxgl.hpp
parent2ed81bbaaeecab12ea50813275269a3b1778f8ea (diff)
downloadqtlocation-mapboxgl-1ce6e1b4bb164a9735742b0cf3f63b7417bc96ae.tar.gz
[Qt] Move QMapboxGL::MapChange to QMapbox namespace
Diffstat (limited to 'platform/qt/include/qmapboxgl.hpp')
-rw-r--r--platform/qt/include/qmapboxgl.hpp22
1 files changed, 1 insertions, 21 deletions
diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp
index cb9bf1a2d5..fec96e6fb7 100644
--- a/platform/qt/include/qmapboxgl.hpp
+++ b/platform/qt/include/qmapboxgl.hpp
@@ -85,7 +85,6 @@ class Q_DECL_EXPORT QMapboxGL : public QObject
Q_PROPERTY(double zoom READ zoom WRITE setZoom)
Q_PROPERTY(double bearing READ bearing WRITE setBearing)
Q_PROPERTY(double pitch READ pitch WRITE setPitch)
- Q_ENUMS(MapChange)
public:
// Determines the orientation of the map.
@@ -96,23 +95,6 @@ public:
NorthLeftwards,
};
- // Reflects mbgl::MapChange.
- enum MapChange {
- MapChangeRegionWillChange = 0,
- MapChangeRegionWillChangeAnimated,
- MapChangeRegionIsChanging,
- MapChangeRegionDidChange,
- MapChangeRegionDidChangeAnimated,
- MapChangeWillStartLoadingMap,
- MapChangeDidFinishLoadingMap,
- MapChangeDidFailLoadingMap,
- MapChangeWillStartRenderingFrame,
- MapChangeDidFinishRenderingFrame,
- MapChangeDidFinishRenderingFrameFullyRendered,
- MapChangeWillStartRenderingMap,
- MapChangeDidFinishRenderingMap,
- MapChangeDidFinishRenderingMapFullyRendered
- };
QMapboxGL(QObject *parent = 0, const QMapboxGLSettings& = QMapboxGLSettings());
virtual ~QMapboxGL();
@@ -222,7 +204,7 @@ public slots:
signals:
void needsRendering();
- void mapChanged(QMapboxGL::MapChange);
+ void mapChanged(QMapbox::MapChange);
private:
Q_DISABLE_COPY(QMapboxGL)
@@ -230,6 +212,4 @@ private:
QMapboxGLPrivate *d_ptr;
};
-Q_DECLARE_METATYPE(QMapboxGL::MapChange);
-
#endif // QMAPBOXGL_H