diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2017-07-05 20:20:20 +0300 |
|---|---|---|
| committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-07-18 10:45:12 +0200 |
| commit | 815ffb253b555c9a99b7d63a343745db05802c76 (patch) | |
| tree | bb88441f06a1db50415331a986ee7cea7ad1318e /platform/qt | |
| parent | 46c43510d7ac5fe078010d5f0f5d39c4d5df3305 (diff) | |
| download | qtlocation-mapboxgl-815ffb253b555c9a99b7d63a343745db05802c76.tar.gz | |
[android][glfw][ios][macos][node][qt] rename backend to renderer backend
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 2 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_p.hpp | 6 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_renderer_frontend_p.cpp | 2 | ||||
| -rw-r--r-- | platform/qt/src/thread_local.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index aa02900c95..06901b13ba 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -8,7 +8,6 @@ #include <mbgl/annotation/annotation.hpp> #include <mbgl/map/camera.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/map/backend_scope.hpp> #include <mbgl/math/minmax.hpp> #include <mbgl/style/style.hpp> #include <mbgl/style/conversion.hpp> @@ -19,6 +18,7 @@ #include <mbgl/style/transition_options.hpp> #include <mbgl/style/image.hpp> #include <mbgl/renderer/renderer.hpp> +#include <mbgl/renderer/backend_scope.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/util/color.hpp> #include <mbgl/util/constants.hpp> diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index b9c1124551..3afd299067 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/platform/qt/src/qmapboxgl_p.hpp @@ -4,8 +4,8 @@ #include "qmapboxgl_renderer_frontend_p.hpp" #include <mbgl/map/map.hpp> -#include <mbgl/map/backend.hpp> #include <mbgl/map/view.hpp> +#include <mbgl/renderer/renderer_backend.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/geo.hpp> @@ -13,7 +13,7 @@ #include <QObject> #include <QSize> -class QMapboxGLPrivate : public QObject, public mbgl::View, public mbgl::Backend, public mbgl::MapObserver +class QMapboxGLPrivate : public QObject, public mbgl::View, public mbgl::RendererBackend, public mbgl::MapObserver { Q_OBJECT @@ -27,7 +27,7 @@ public: // mbgl::View implementation. void bind() final; - // mbgl::Backend implementation. + // mbgl::RendererBackend implementation. void updateAssumedState() final; void activate() final {} void deactivate() final {} diff --git a/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp b/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp index 836a9431b8..fd57168df6 100644 --- a/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp +++ b/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp @@ -1,6 +1,6 @@ #include "qmapboxgl_renderer_frontend_p.hpp" -#include <mbgl/map/backend_scope.hpp> +#include <mbgl/renderer/backend_scope.hpp> #include <mbgl/renderer/renderer.hpp> QMapboxGLRendererFrontend::QMapboxGLRendererFrontend(std::unique_ptr<mbgl::Renderer> renderer_, mbgl::View& view_) diff --git a/platform/qt/src/thread_local.cpp b/platform/qt/src/thread_local.cpp index e835a680e2..bf2103c98f 100644 --- a/platform/qt/src/thread_local.cpp +++ b/platform/qt/src/thread_local.cpp @@ -1,7 +1,7 @@ #include <mbgl/util/thread_local.hpp> #include <mbgl/util/run_loop.hpp> -#include <mbgl/map/backend_scope.hpp> +#include <mbgl/renderer/backend_scope.hpp> #include <array> #include <cassert> |