[Qt] Header cleanup (#6477)

Make some headers private, so we only commit with the QML API.

platform/qt/config.cmake

@@ -57,6 +57,10 @@ macro(mbgl_platform_test)
     target_add_mason_package(mbgl-test PRIVATE sqlite)
 
     target_link_libraries(mbgl-test
+        PRIVATE qmapboxgl
         ${MBGL_QT_LIBRARIES}
     )
 endmacro()
+
+target_add_mason_package(qmapboxgl PRIVATE geojson)
+target_add_mason_package(qmapboxgl PRIVATE rapidjson)

platform/qt/include/QQuickMapboxGL

@@ -1 +0,0 @@
-#include "qquickmapboxgl.hpp"

platform/qt/include/QQuickMapboxGLMapParameter

@@ -1 +0,0 @@
-#include "qquickmapboxglmapparameter.hpp"

platform/qt/include/qmapbox.hpp

@@ -84,6 +84,7 @@ typedef void (*CustomLayerRenderFunction)(void* context, const CustomLayerRender
 typedef void (*CustomLayerDeinitializeFunction)(void* context);
 
 Q_DECL_EXPORT void initializeGLExtensions();
+Q_DECL_EXPORT void registerTypes();
 
 } // namespace QMapbox
 

platform/qt/qmlapp/main.cpp

@@ -1,11 +1,10 @@
+#include <QMapbox>
+
 #include <QGuiApplication>
 #include <QIcon>
 #include <QQmlApplicationEngine>
 #include <qqml.h>
 
-#include <QQuickMapboxGL>
-#include <QQuickMapboxGLMapParameter>
-
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
@@ -14,8 +13,9 @@ int main(int argc, char *argv[])
     app.setWindowIcon(QIcon(":icon.png"));
 #endif
 
-    qmlRegisterType<QQuickMapboxGL>("QQuickMapboxGL", 1, 0, "MapboxMap");
-    qmlRegisterType<QQuickMapboxGLMapParameter>("QQuickMapboxGL", 1, 0, "MapParameter");
+    // Exposes the QQuickMapboxGL module so we
+    // can do `import QQuickMapboxGL 1.0`.
+    QMapbox::registerTypes();
 
     QQmlApplicationEngine engine;
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));

platform/qt/qt.cmake

@@ -37,24 +37,26 @@ set(MBGL_QT_FILES
     PRIVATE platform/qt/src/http_request.cpp
     PRIVATE platform/qt/src/http_request.hpp
     PRIVATE platform/qt/src/image.cpp
-    PRIVATE platform/qt/src/qmapbox.cpp
-    PRIVATE platform/qt/src/qmapboxgl.cpp
-    PRIVATE platform/qt/src/qmapboxgl_p.hpp
     PRIVATE platform/qt/src/run_loop.cpp
     PRIVATE platform/qt/src/run_loop_impl.hpp
     PRIVATE platform/qt/src/string_stdlib.cpp
     PRIVATE platform/qt/src/timer.cpp
     PRIVATE platform/qt/src/timer_impl.hpp
-
-    # Public headers
-    PRIVATE platform/qt/include/qmapbox.hpp
-    PRIVATE platform/qt/include/qmapboxgl.hpp
 )
 
 include_directories(
     PRIVATE platform/qt/include
 )
 
+# Shared library
+add_library(qmapboxgl SHARED
+    platform/qt/include/qmapbox.hpp
+    platform/qt/include/qmapboxgl.hpp
+    platform/qt/src/qmapbox.cpp
+    platform/qt/src/qmapboxgl.cpp
+    platform/qt/src/qmapboxgl_p.hpp
+)
+
 # C++ app
 add_executable(mbgl-qt
     platform/qt/app/main.cpp

platform/qt/qt4.cmake

@@ -9,11 +9,11 @@ set(MBGL_QT_LIBRARIES
     PRIVATE Qt4::QtOpenGL
 )
 
-add_library(qmapboxgl SHARED)
-
 target_link_libraries(qmapboxgl
-    PUBLIC mbgl-core
+    PRIVATE mbgl-core
     PRIVATE Qt4::QtCore
+    PRIVATE Qt4::QtGui
+    PRIVATE Qt4::QtOpenGL
 )
 
 target_link_libraries(mbgl-qt

platform/qt/qt5.cmake

@@ -11,17 +11,19 @@ QT5_ADD_RESOURCES(MBGL_QT_FILES platform/qt/qmapbox.qrc)
 set(MBGL_QT_LIBRARIES
     PRIVATE Qt5::Core
     PRIVATE Qt5::Gui
+    PRIVATE Qt5::Location
     PRIVATE Qt5::Network
     PRIVATE Qt5::OpenGL
+    PRIVATE Qt5::Quick
 )
 
-add_library(qmapboxgl SHARED
-    platform/qt/include/qquickmapboxgl.hpp
-    platform/qt/include/qquickmapboxglmapparameter.hpp
-    platform/qt/src/qquickmapboxgl.cpp
-    platform/qt/src/qquickmapboxglmapparameter.cpp
-    platform/qt/src/qquickmapboxglrenderer.cpp
-    platform/qt/src/qquickmapboxglrenderer.hpp
+target_sources(qmapboxgl
+    PRIVATE platform/qt/src/qquickmapboxgl.cpp
+    PRIVATE platform/qt/src/qquickmapboxgl.hpp
+    PRIVATE platform/qt/src/qquickmapboxglmapparameter.cpp
+    PRIVATE platform/qt/src/qquickmapboxglmapparameter.hpp
+    PRIVATE platform/qt/src/qquickmapboxglrenderer.cpp
+    PRIVATE platform/qt/src/qquickmapboxglrenderer.hpp
 )
 
 target_link_libraries(qmapboxgl

platform/qt/src/async_task.cpp

@@ -1,7 +1,6 @@
-#include <mbgl/util/async_task.hpp>
-
 #include "async_task_impl.hpp"
 
+#include <mbgl/util/async_task.hpp>
 #include <mbgl/util/run_loop.hpp>
 
 #include <cassert>

platform/qt/src/qmapbox.cpp

@@ -1,12 +1,14 @@
-#include <mbgl/map/change.hpp>
+#include "qmapbox.hpp"
+
 #include <mbgl/gl/gl.hpp>
+#include <mbgl/map/change.hpp>
 #include <mbgl/storage/network_status.hpp>
 #include <mbgl/util/default_styles.hpp>
 #include <mbgl/util/traits.hpp>
 
-#include <QMapbox>
-
 #if QT_VERSION >= 0x050000
+#include "qquickmapboxgl.hpp"
+#include "qquickmapboxglmapparameter.hpp"
 #include <QOpenGLContext>
 #else
 #include <QGLContext>
@@ -73,4 +75,12 @@ Q_DECL_EXPORT void initializeGLExtensions()
     });
 }
 
+Q_DECL_EXPORT void registerTypes()
+{
+#if QT_VERSION >= 0x050000
+    qmlRegisterType<QQuickMapboxGL>("QQuickMapboxGL", 1, 0, "MapboxMap");
+    qmlRegisterType<QQuickMapboxGLMapParameter>("QQuickMapboxGL", 1, 0, "MapParameter");
+#endif
+}
+
 }

platform/qt/src/qmapboxgl.cpp

@@ -1,3 +1,4 @@
+#include "qmapboxgl.hpp"
 #include "qmapboxgl_p.hpp"
 
 #include "qt_conversion.hpp"
@@ -28,7 +29,6 @@
 
 #include <QDebug>
 #include <QImage>
-#include <QMapboxGL>
 #include <QMargins>
 #include <QString>
 #include <QStringList>

platform/qt/src/qmapboxgl_p.hpp

@@ -1,11 +1,12 @@
 #pragma once
 
+#include "qmapboxgl.hpp"
+
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/view.hpp>
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/util/geo.hpp>
 
-#include <QMapboxGL>
 #include <QObject>
 #include <QSize>
 

platform/qt/src/qquickmapboxgl.cpp

@@ -1,11 +1,11 @@
+#include "qquickmapboxgl.hpp"
+
+#include "qmapbox.hpp"
+#include "qquickmapboxglmapparameter.hpp"
 #include "qquickmapboxglrenderer.hpp"
 
 #include <mbgl/util/constants.hpp>
 
-#include <QMapbox>
-#include <QQuickMapboxGL>
-#include <QQuickMapboxGLMapParameter>
-
 #include <QDebug>
 #include <QQuickItem>
 #include <QRegularExpression>
@@ -14,7 +14,6 @@
 #include <QQmlListProperty>
 #include <QJSValue>
 
-
 namespace {
 
 static const QRegularExpression s_camelCase {"([a-z0-9])([A-Z])"};

platform/qt/src/qquickmapboxgl.hpp

@@ -1,17 +1,16 @@
-#ifndef QQUICKMAPBOXGL_H
-#define QQUICKMAPBOXGL_H
+#pragma once
+
+#include "qmapbox.hpp"
+#include "qquickmapboxglmapparameter.hpp"
 
 #include <QColor>
-#include <QImage>
 #include <QGeoCoordinate>
 #include <QGeoServiceProvider>
 #include <QGeoShape>
+#include <QImage>
 #include <QPointF>
-#include <QQuickFramebufferObject>
 #include <QQmlListProperty>
-
-#include <QMapbox>
-#include <QQuickMapboxGLMapParameter>
+#include <QQuickFramebufferObject>
 
 class QDeclarativeGeoServiceProvider;
 class QQuickItem;
@@ -174,5 +173,3 @@ private:
 
     friend class QQuickMapboxGLRenderer;
 };
-
-#endif // QQUICKMAPBOXGL_H

platform/qt/src/qquickmapboxglmapparameter.cpp

@@ -1,11 +1,10 @@
-#include "QQuickMapboxGLMapParameter"
+#include "qquickmapboxglmapparameter.hpp"
 
 #include <QByteArray>
 #include <QMetaObject>
 #include <QMetaProperty>
 #include <QSignalMapper>
 
-
 QQuickMapboxGLMapParameter::QQuickMapboxGLMapParameter(QObject *parent)
     : QObject(parent)
     , m_metaPropertyOffset(metaObject()->propertyCount())

platform/qt/src/qquickmapboxglmapparameter.hpp

@@ -1,5 +1,4 @@
-#ifndef QQUICKMAPBOXGLMAPPARAMETER_H
-#define QQUICKMAPBOXGLMAPPARAMETER_H
+#pragma once
 
 #include <QObject>
 #include <QQmlParserStatus>
@@ -33,5 +32,3 @@ private:
 };
 
 QML_DECLARE_TYPE(QQuickMapboxGLMapParameter)
-
-#endif // QQUICKMAPBOXGLMAPPARAMETER_H

platform/qt/src/qquickmapboxglrenderer.cpp

@@ -1,7 +1,7 @@
 #include "qquickmapboxglrenderer.hpp"
 
-#include <QMapboxGL>
-#include <QQuickMapboxGL>
+#include "qmapboxgl.hpp"
+#include "qquickmapboxgl.hpp"
 
 #include <QSize>
 #include <QOpenGLFramebufferObject>

platform/qt/src/qquickmapboxglrenderer.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
+#include "qmapbox.hpp"
+#include "qmapboxgl.hpp"
+
 #include <QObject>
 #include <QQuickFramebufferObject>
 #include <QScopedPointer>
 
-#include <QMapbox>
-#include <QMapboxGL>
-
 class QGeoCoordinate;
 class QOpenGLFramebufferObject;
 class QSize;

platform/qt/src/qt_geojson.hpp

@@ -4,12 +4,12 @@
 #include <mbgl/style/conversion/geojson.hpp>
 #include <mbgl/util/rapidjson.hpp>
 
-#include <sstream>
-#include <string>
-
 #include <QByteArray>
 #include <QVariant>
 
+#include <sstream>
+#include <string>
+
 namespace mbgl {
 namespace style {
 namespace conversion {

platform/qt/src/run_loop.cpp

@@ -4,11 +4,10 @@
 
 #include <QCoreApplication>
 
+#include <cassert>
 #include <functional>
 #include <utility>
 
-#include <cassert>
-
 namespace {
 
 using namespace mbgl::util;

platform/qt/src/timer.cpp

@@ -1,11 +1,10 @@
-#include <mbgl/util/timer.hpp>
+#include "timer_impl.hpp"
 
 #include <mbgl/util/run_loop.hpp>
+#include <mbgl/util/timer.hpp>
 
 #include <memory>
 
-#include "timer_impl.hpp"
-
 namespace mbgl {
 namespace util {