[Qt] Move QMapboxGL::MapChange to QMapbox namespace

8 files changed, 66 insertions, 63 deletions

diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp
index 60ef0a306f..dcdc33d59d 100644
--- a/platform/qt/include/qmapbox.hpp
+++ b/platform/qt/include/qmapbox.hpp
@@ -23,11 +23,31 @@ typedef QPair<Coordinate, QString> PointAnnotation;
 // FIXME: We need to add support for custom style properties
 typedef QPair<LineString, QString> ShapeAnnotation;
 
+// Reflects mbgl::NetworkStatus::Status.
 enum NetworkMode {
     Online, // Default
     Offline,
 };
 
+// Reflects mbgl::MapChange.
+enum MapChange {
+    MapChangeRegionWillChange = 0,
+    MapChangeRegionWillChangeAnimated,
+    MapChangeRegionIsChanging,
+    MapChangeRegionDidChange,
+    MapChangeRegionDidChangeAnimated,
+    MapChangeWillStartLoadingMap,
+    MapChangeDidFinishLoadingMap,
+    MapChangeDidFailLoadingMap,
+    MapChangeWillStartRenderingFrame,
+    MapChangeDidFinishRenderingFrame,
+    MapChangeDidFinishRenderingFrameFullyRendered,
+    MapChangeWillStartRenderingMap,
+    MapChangeDidFinishRenderingMap,
+    MapChangeDidFinishRenderingMapFullyRendered,
+    MapChangeDidFinishLoadingStyle
+};
+
 struct Q_DECL_EXPORT CameraOptions {
     QVariant center;  // Coordinate
     QVariant anchor;  // QPointF
@@ -64,8 +84,9 @@ typedef void (*CustomLayerDeinitializeFunction)(void* context);
 
 Q_DECL_EXPORT void initializeGLExtensions();
 
-}
+} // namespace QMapbox
 
 Q_DECLARE_METATYPE(QMapbox::Coordinate);
+Q_DECLARE_METATYPE(QMapbox::MapChange);
 
 #endif // QMAPBOX_H
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
diff --git a/platform/qt/src/qmapbox.cpp b/platform/qt/src/qmapbox.cpp
index 17ddbe4ca5..5f4ad01873 100644
--- a/platform/qt/src/qmapbox.cpp
+++ b/platform/qt/src/qmapbox.cpp
@@ -1,3 +1,4 @@
+#include <mbgl/map/change.hpp>
 #include <mbgl/gl/gl.hpp>
 #include <mbgl/storage/network_status.hpp>
 #include <mbgl/util/default_styles.hpp>
@@ -11,10 +12,27 @@
 #include <QGLContext>
 #endif
 
-// mbgl::MapMode
+// mbgl::NetworkStatus::Status
 static_assert(mbgl::underlying_type(QMapbox::Online) == mbgl::underlying_type(mbgl::NetworkStatus::Status::Online), "error");
 static_assert(mbgl::underlying_type(QMapbox::Offline) == mbgl::underlying_type(mbgl::NetworkStatus::Status::Offline), "error");
 
+// mbgl::MapChange
+static_assert(mbgl::underlying_type(QMapbox::MapChangeRegionWillChange) == mbgl::underlying_type(mbgl::MapChangeRegionWillChange), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeRegionWillChangeAnimated) == mbgl::underlying_type(mbgl::MapChangeRegionWillChangeAnimated), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeRegionIsChanging) == mbgl::underlying_type(mbgl::MapChangeRegionIsChanging), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeRegionDidChange) == mbgl::underlying_type(mbgl::MapChangeRegionDidChange), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeRegionDidChangeAnimated) == mbgl::underlying_type(mbgl::MapChangeRegionDidChangeAnimated), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeWillStartLoadingMap) == mbgl::underlying_type(mbgl::MapChangeWillStartLoadingMap), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishLoadingMap) == mbgl::underlying_type(mbgl::MapChangeDidFinishLoadingMap), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFailLoadingMap) == mbgl::underlying_type(mbgl::MapChangeDidFailLoadingMap), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeWillStartRenderingFrame) == mbgl::underlying_type(mbgl::MapChangeWillStartRenderingFrame), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishRenderingFrame) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingFrame), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishRenderingFrameFullyRendered) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingFrameFullyRendered), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeWillStartRenderingMap) == mbgl::underlying_type(mbgl::MapChangeWillStartRenderingMap), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishRenderingMap) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMap), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishRenderingMapFullyRendered) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMapFullyRendered), "error");
+static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishLoadingStyle) == mbgl::underlying_type(mbgl::MapChangeDidFinishLoadingStyle), "error");
+
 namespace QMapbox {
 
 Q_DECL_EXPORT NetworkMode networkMode()
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 3dfbde56a1..048158b9b9 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -61,22 +61,6 @@ static_assert(mbgl::underlying_type(QMapboxGL::NorthRightwards) == mbgl::underly
 static_assert(mbgl::underlying_type(QMapboxGL::NorthDownwards) == mbgl::underlying_type(mbgl::NorthOrientation::Downwards), "error");
 static_assert(mbgl::underlying_type(QMapboxGL::NorthLeftwards) == mbgl::underlying_type(mbgl::NorthOrientation::Leftwards), "error");
 
-// mbgl::MapChange
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionWillChange) == mbgl::underlying_type(mbgl::MapChangeRegionWillChange), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionWillChangeAnimated) == mbgl::underlying_type(mbgl::MapChangeRegionWillChangeAnimated), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionIsChanging) == mbgl::underlying_type(mbgl::MapChangeRegionIsChanging), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionDidChange) == mbgl::underlying_type(mbgl::MapChangeRegionDidChange), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeRegionDidChangeAnimated) == mbgl::underlying_type(mbgl::MapChangeRegionDidChangeAnimated), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeWillStartLoadingMap) == mbgl::underlying_type(mbgl::MapChangeWillStartLoadingMap), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishLoadingMap) == mbgl::underlying_type(mbgl::MapChangeDidFinishLoadingMap), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFailLoadingMap) == mbgl::underlying_type(mbgl::MapChangeDidFailLoadingMap), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeWillStartRenderingFrame) == mbgl::underlying_type(mbgl::MapChangeWillStartRenderingFrame), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishRenderingFrame) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingFrame), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishRenderingFrameFullyRendered) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingFrameFullyRendered), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeWillStartRenderingMap) == mbgl::underlying_type(mbgl::MapChangeWillStartRenderingMap), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishRenderingMap) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMap), "error");
-static_assert(mbgl::underlying_type(QMapboxGL::MapChangeDidFinishRenderingMapFullyRendered) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMapFullyRendered), "error");
-
 namespace {
 
 QThreadStorage<std::shared_ptr<mbgl::util::RunLoop>> loop;
@@ -323,7 +307,7 @@ QString QMapboxGL::styleUrl() const
     {Mapbox Style Specification}.
 
     \note In case of a invalid style it will trigger a mapChanged
-    signal with QMapboxGL::MapChangeDidFailLoadingMap as argument.
+    signal with QMapbox::MapChangeDidFailLoadingMap as argument.
 */
 void QMapboxGL::setStyleJson(const QString &style)
 {
@@ -340,7 +324,7 @@ void QMapboxGL::setStyleJson(const QString &style)
     be fetched from anything that QNetworkAccessManager can handle.
 
     \note In case of a invalid style it will trigger a mapChanged
-    signal with QMapboxGL::MapChangeDidFailLoadingMap as argument.
+    signal with QMapbox::MapChangeDidFailLoadingMap as argument.
 */
 void QMapboxGL::setStyleUrl(const QString &url)
 {
@@ -832,11 +816,11 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin
         static_cast<mbgl::ConstrainMode>(settings.constrainMode()),
         static_cast<mbgl::ViewportMode>(settings.viewportMode())))
 {
-    qRegisterMetaType<QMapboxGL::MapChange>("QMapboxGL::MapChange");
+    qRegisterMetaType<QMapbox::MapChange>("QMapbox::MapChange");
 
     fileSourceObj->setAccessToken(settings.accessToken().toStdString());
     connect(this, SIGNAL(needsRendering()), q_ptr, SIGNAL(needsRendering()), Qt::QueuedConnection);
-    connect(this, SIGNAL(mapChanged(QMapboxGL::MapChange)), q_ptr, SIGNAL(mapChanged(QMapboxGL::MapChange)), Qt::QueuedConnection);
+    connect(this, SIGNAL(mapChanged(QMapbox::MapChange)), q_ptr, SIGNAL(mapChanged(QMapbox::MapChange)), Qt::QueuedConnection);
 }
 
 QMapboxGLPrivate::~QMapboxGLPrivate()
@@ -879,7 +863,7 @@ void QMapboxGLPrivate::invalidate()
 
 void QMapboxGLPrivate::notifyMapChange(mbgl::MapChange change)
 {
-    emit mapChanged(static_cast<QMapboxGL::MapChange>(change));
+    emit mapChanged(static_cast<QMapbox::MapChange>(change));
 }
 
 void QMapboxGLPrivate::connectionEstablished()
diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp
index fb8a5df4e7..106ce97d50 100644
--- a/platform/qt/src/qmapboxgl_p.hpp
+++ b/platform/qt/src/qmapboxgl_p.hpp
@@ -42,5 +42,5 @@ public slots:
 
 signals:
     void needsRendering();
-    void mapChanged(QMapboxGL::MapChange);
+    void mapChanged(QMapbox::MapChange);
 };
diff --git a/platform/qt/src/qquickmapboxglrenderer.cpp b/platform/qt/src/qquickmapboxglrenderer.cpp
index 9ced17bb35..862f6a133c 100644
--- a/platform/qt/src/qquickmapboxglrenderer.cpp
+++ b/platform/qt/src/qquickmapboxglrenderer.cpp
@@ -20,14 +20,14 @@ QQuickMapboxGLRenderer::QQuickMapboxGLRenderer()
     settings.setViewportMode(QMapboxGLSettings::FlippedYViewport);
 
     m_map.reset(new QMapboxGL(nullptr, settings));
-    connect(m_map.data(), SIGNAL(mapChanged(QMapboxGL::MapChange)), this, SLOT(onMapChanged(QMapboxGL::MapChange)));
+    connect(m_map.data(), SIGNAL(mapChanged(QMapbox::MapChange)), this, SLOT(onMapChanged(QMapbox::MapChange)));
 }
 
 QQuickMapboxGLRenderer::~QQuickMapboxGLRenderer()
 {
 }
 
-void QQuickMapboxGLRenderer::onMapChanged(QMapboxGL::MapChange change)
+void QQuickMapboxGLRenderer::onMapChanged(QMapbox::MapChange change)
 {
     auto onMapChangeWillStartLoadingMap = [&]() {
         m_styleLoaded = false;
@@ -39,10 +39,10 @@ void QQuickMapboxGLRenderer::onMapChanged(QMapboxGL::MapChange change)
     };
 
     switch (change) {
-    case QMapboxGL::MapChangeWillStartLoadingMap:
+    case QMapbox::MapChangeWillStartLoadingMap:
         onMapChangeWillStartLoadingMap();
         break;
-    case QMapboxGL::MapChangeDidFinishLoadingMap:
+    case QMapbox::MapChangeDidFinishLoadingMap:
         onMapChangeDidFinishLoadingMap();
         break;
     default:
diff --git a/platform/qt/src/qquickmapboxglrenderer.hpp b/platform/qt/src/qquickmapboxglrenderer.hpp
index a5e56e3675..91a5ed6065 100644
--- a/platform/qt/src/qquickmapboxglrenderer.hpp
+++ b/platform/qt/src/qquickmapboxglrenderer.hpp
@@ -28,7 +28,7 @@ signals:
     void styleChanged();
 
 public slots:
-    void onMapChanged(QMapboxGL::MapChange);
+    void onMapChanged(QMapbox::MapChange);
 
 private:
     bool m_initialized = false;
diff --git a/platform/qt/test/qmapboxgl.cpp b/platform/qt/test/qmapboxgl.cpp
index 67b2163ab8..8bcc485d89 100644
--- a/platform/qt/test/qmapboxgl.cpp
+++ b/platform/qt/test/qmapboxgl.cpp
@@ -11,8 +11,8 @@ class QMapboxGLTest : public QObject, public ::testing::Test {
 
 public:
     QMapboxGLTest() : app(argc, const_cast<char**>(&argv)), map(nullptr, settings) {
-        connect(&map, SIGNAL(mapChanged(QMapboxGL::MapChange)),
-                this, SLOT(onMapChanged(QMapboxGL::MapChange)));
+        connect(&map, SIGNAL(mapChanged(QMapbox::MapChange)),
+                this, SLOT(onMapChanged(QMapbox::MapChange)));
         connect(&map, SIGNAL(needsRendering()),
                 this, SLOT(onNeedsRendering()));
 
@@ -23,8 +23,8 @@ public:
         map.setCoordinateZoom(QMapbox::Coordinate(60.170448, 24.942046), 14);
     }
 
-    void runUntil(QMapboxGL::MapChange status) {
-        changeCallback = [&](QMapboxGL::MapChange change) {
+    void runUntil(QMapbox::MapChange status) {
+        changeCallback = [&](QMapbox::MapChange change) {
             if (change == status) {
                 app.exit();
                 changeCallback = nullptr;
@@ -45,10 +45,10 @@ protected:
     QMapboxGLSettings settings;
     QMapboxGL map;
 
-    std::function<void(QMapboxGL::MapChange)> changeCallback;
+    std::function<void(QMapbox::MapChange)> changeCallback;
 
 private slots:
-    void onMapChanged(QMapboxGL::MapChange change) {
+    void onMapChanged(QMapbox::MapChange change) {
         if (changeCallback) {
             changeCallback(change);
         }
@@ -65,16 +65,16 @@ TEST_F(QMapboxGLTest, TEST_DISABLED_ON_CI(styleJson)) {
 
     map.setStyleJson(json);
     ASSERT_EQ(map.styleJson(), json);
-    runUntil(QMapboxGL::MapChangeDidFinishLoadingMap);
+    runUntil(QMapbox::MapChangeDidFinishLoadingMap);
 
     map.setStyleJson("invalid json");
-    runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+    runUntil(QMapbox::MapChangeDidFailLoadingMap);
 
     map.setStyleJson("\"\"");
-    runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+    runUntil(QMapbox::MapChangeDidFailLoadingMap);
 
     map.setStyleJson(QString());
-    runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+    runUntil(QMapbox::MapChangeDidFailLoadingMap);
 }
 
 TEST_F(QMapboxGLTest, TEST_DISABLED_ON_CI(styleUrl)) {
@@ -82,13 +82,13 @@ TEST_F(QMapboxGLTest, TEST_DISABLED_ON_CI(styleUrl)) {
 
     map.setStyleUrl(url);
     ASSERT_EQ(map.styleUrl(), url);
-    runUntil(QMapboxGL::MapChangeDidFinishLoadingMap);
+    runUntil(QMapbox::MapChangeDidFinishLoadingMap);
 
     map.setStyleUrl("invalid://url");
-    runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+    runUntil(QMapbox::MapChangeDidFailLoadingMap);
 
     map.setStyleUrl(QString());
-    runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+    runUntil(QMapbox::MapChangeDidFailLoadingMap);
 }
 
 #include "qmapboxgl.moc"