diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2016-09-27 16:18:04 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-27 16:18:04 +0300 |
commit | e881795ed10484ecfe8de73aaaa349c44eb259db (patch) | |
tree | 1be2ea7d8295bc8d6cb990f095083ad70eed995a /platform | |
parent | 0c0671bff0aa7f2ac7fe0c3e2221e050fbda6905 (diff) | |
download | qtlocation-mapboxgl-e881795ed10484ecfe8de73aaaa349c44eb259db.tar.gz |
[Qt] Header cleanup (#6477)
Make some headers private, so we only commit with the QML API.
Diffstat (limited to 'platform')
21 files changed, 71 insertions, 64 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 3294310006..d8ede6b450 100644 --- a/platform/qt/config.cmake +++ b/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) diff --git a/platform/qt/include/QQuickMapboxGL b/platform/qt/include/QQuickMapboxGL deleted file mode 100644 index db109a1d3a..0000000000 --- a/platform/qt/include/QQuickMapboxGL +++ /dev/null @@ -1 +0,0 @@ -#include "qquickmapboxgl.hpp" diff --git a/platform/qt/include/QQuickMapboxGLMapParameter b/platform/qt/include/QQuickMapboxGLMapParameter deleted file mode 100644 index 603fb2bd51..0000000000 --- a/platform/qt/include/QQuickMapboxGLMapParameter +++ /dev/null @@ -1 +0,0 @@ -#include "qquickmapboxglmapparameter.hpp" diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp index 4975076eee..9de4a7041d 100644 --- a/platform/qt/include/qmapbox.hpp +++ b/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 diff --git a/platform/qt/qmlapp/main.cpp b/platform/qt/qmlapp/main.cpp index 030f6cc4bd..0dd8c96b7d 100644 --- a/platform/qt/qmlapp/main.cpp +++ b/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"))); diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index bee8e3e27b..e606750be7 100644 --- a/platform/qt/qt.cmake +++ b/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 diff --git a/platform/qt/qt4.cmake b/platform/qt/qt4.cmake index 451edbc15b..56e41e847a 100644 --- a/platform/qt/qt4.cmake +++ b/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 diff --git a/platform/qt/qt5.cmake b/platform/qt/qt5.cmake index 45b82e0311..687a041b18 100644 --- a/platform/qt/qt5.cmake +++ b/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 diff --git a/platform/qt/src/async_task.cpp b/platform/qt/src/async_task.cpp index c376c1c370..79abd2945e 100644 --- a/platform/qt/src/async_task.cpp +++ b/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> diff --git a/platform/qt/src/qmapbox.cpp b/platform/qt/src/qmapbox.cpp index a101eb4986..7e7a3c5f84 100644 --- a/platform/qt/src/qmapbox.cpp +++ b/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 +} + } diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 74238bd240..103ed83256 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/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> diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index 106ce97d50..11b5f695ca 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/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> diff --git a/platform/qt/src/qquickmapboxgl.cpp b/platform/qt/src/qquickmapboxgl.cpp index f71f869c9c..b17d8bfe3e 100644 --- a/platform/qt/src/qquickmapboxgl.cpp +++ b/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])"}; diff --git a/platform/qt/include/qquickmapboxgl.hpp b/platform/qt/src/qquickmapboxgl.hpp index 44878c246e..64cc41bf78 100644 --- a/platform/qt/include/qquickmapboxgl.hpp +++ b/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 diff --git a/platform/qt/src/qquickmapboxglmapparameter.cpp b/platform/qt/src/qquickmapboxglmapparameter.cpp index 68fe8fac85..abf6e5ff1c 100644 --- a/platform/qt/src/qquickmapboxglmapparameter.cpp +++ b/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()) diff --git a/platform/qt/include/qquickmapboxglmapparameter.hpp b/platform/qt/src/qquickmapboxglmapparameter.hpp index 914b8e6790..1dca0cf55d 100644 --- a/platform/qt/include/qquickmapboxglmapparameter.hpp +++ b/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 diff --git a/platform/qt/src/qquickmapboxglrenderer.cpp b/platform/qt/src/qquickmapboxglrenderer.cpp index 4208047380..d550794d64 100644 --- a/platform/qt/src/qquickmapboxglrenderer.cpp +++ b/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> diff --git a/platform/qt/src/qquickmapboxglrenderer.hpp b/platform/qt/src/qquickmapboxglrenderer.hpp index fa9b81ec7f..e0fc767d58 100644 --- a/platform/qt/src/qquickmapboxglrenderer.hpp +++ b/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; diff --git a/platform/qt/src/qt_geojson.hpp b/platform/qt/src/qt_geojson.hpp index fd2b689fed..07813623fd 100644 --- a/platform/qt/src/qt_geojson.hpp +++ b/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 { diff --git a/platform/qt/src/run_loop.cpp b/platform/qt/src/run_loop.cpp index d33eb9cda6..1c199be9de 100644 --- a/platform/qt/src/run_loop.cpp +++ b/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; diff --git a/platform/qt/src/timer.cpp b/platform/qt/src/timer.cpp index 6d0ccb41d7..a0c1328d63 100644 --- a/platform/qt/src/timer.cpp +++ b/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 { |