[Qt] s/mapRegionDidChange()/mapChanged(QMapboxGL::MapChange)/ signal

2 files changed, 5 insertions, 17 deletions

diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 01f0ad75af..5f580c6f36 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -584,9 +584,11 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin
         static_cast<mbgl::GLContextMode>(settings.contextMode()),
         static_cast<mbgl::ConstrainMode>(settings.constrainMode())))
 {
+    qRegisterMetaType<QMapboxGL::MapChange>("QMapboxGL::MapChange");
+
     fileSourceObj->setAccessToken(settings.accessToken().toStdString());
     connect(this, SIGNAL(needsRendering()), q_ptr, SIGNAL(needsRendering()), Qt::QueuedConnection);
-    connect(this, SIGNAL(mapRegionDidChange()), q_ptr, SIGNAL(mapRegionDidChange()));
+    connect(this, SIGNAL(mapChanged(QMapboxGL::MapChange)), q_ptr, SIGNAL(mapChanged(QMapboxGL::MapChange)), Qt::QueuedConnection);
 }
 
 QMapboxGLPrivate::~QMapboxGLPrivate()
@@ -619,16 +621,7 @@ void QMapboxGLPrivate::invalidate()
 
 void QMapboxGLPrivate::notifyMapChange(mbgl::MapChange change)
 {
-    // Map thread.
-    switch (change) {
-    case mbgl::MapChangeRegionDidChange:
-    case mbgl::MapChangeRegionDidChangeAnimated:
-    case mbgl::MapChangeRegionIsChanging:
-        emit mapRegionDidChange();
-        break;
-    default:
-        break;
-    }
+    emit mapChanged(static_cast<QMapboxGL::MapChange>(change));
 }
 
 void QMapboxGLPrivate::connectionEstablished()
diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp
index c520073215..1e52f43363 100644
--- a/platform/qt/src/qmapboxgl_p.hpp
+++ b/platform/qt/src/qmapboxgl_p.hpp
@@ -11,11 +11,6 @@
 #include <QObject>
 #include <QSize>
 
-#include <memory>
-
-class QMapboxGL;
-class QMapboxGLSettings;
-
 class QMapboxGLPrivate : public QObject, public mbgl::View
 {
     Q_OBJECT
@@ -50,8 +45,8 @@ public slots:
     void connectionEstablished();
 
 signals:
-    void mapRegionDidChange();
     void needsRendering();
+    void mapChanged(QMapboxGL::MapChange);
 };
 
 #endif // QMAPBOXGL_P_H