diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-13 16:24:27 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-13 17:56:44 +0200 |
| commit | 8cc100bfd56955c629d5da0bc49ce2bdbae52946 (patch) | |
| tree | a807cdfc906af092eb7158cd90c38834f68a55a0 /platform/qt | |
| parent | 1b39f456fdab71a918427dede28f27281bd28a14 (diff) | |
| download | qtlocation-mapboxgl-8cc100bfd56955c629d5da0bc49ce2bdbae52946.tar.gz | |
[core] Get FileSource via UpdateParameters in Renderer::Impl
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 1 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_map_renderer.cpp | 5 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_map_renderer.hpp | 5 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_renderer_backend.hpp | 1 |
4 files changed, 3 insertions, 9 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index a3ec1bf0e4..990e70c97f 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -1828,7 +1828,6 @@ void QMapboxGLPrivate::createRenderer() m_mapRenderer = std::make_unique<QMapboxGLMapRenderer>( m_pixelRatio, - *m_fileSourceObj, *m_threadPool, m_mode, m_localFontFamily diff --git a/platform/qt/src/qmapboxgl_map_renderer.cpp b/platform/qt/src/qmapboxgl_map_renderer.cpp index 31b518e6d0..8962a8e052 100644 --- a/platform/qt/src/qmapboxgl_map_renderer.cpp +++ b/platform/qt/src/qmapboxgl_map_renderer.cpp @@ -24,9 +24,8 @@ static auto *getScheduler() { return scheduler.localData().get(); }; -QMapboxGLMapRenderer::QMapboxGLMapRenderer(qreal pixelRatio, - mbgl::DefaultFileSource &fs, mbgl::ThreadPool &tp, QMapboxGLSettings::GLContextMode mode, const QString &localFontFamily) - : m_renderer(std::make_unique<mbgl::Renderer>(m_backend, pixelRatio, fs, tp, static_cast<mbgl::GLContextMode>(mode), mbgl::optional<std::string> {}, +QMapboxGLMapRenderer::QMapboxGLMapRenderer(qreal pixelRatio, mbgl::ThreadPool &tp, QMapboxGLSettings::GLContextMode mode, const QString &localFontFamily) + : m_renderer(std::make_unique<mbgl::Renderer>(m_backend, pixelRatio, tp, static_cast<mbgl::GLContextMode>(mode), mbgl::optional<std::string> {}, localFontFamily.isEmpty() ? mbgl::nullopt : mbgl::optional<std::string> { localFontFamily.toStdString() })) , m_forceScheduler(needsToForceScheduler()) { diff --git a/platform/qt/src/qmapboxgl_map_renderer.hpp b/platform/qt/src/qmapboxgl_map_renderer.hpp index a59cf74997..d771a416da 100644 --- a/platform/qt/src/qmapboxgl_map_renderer.hpp +++ b/platform/qt/src/qmapboxgl_map_renderer.hpp @@ -6,7 +6,6 @@ #include <mbgl/renderer/renderer.hpp> #include <mbgl/renderer/renderer_backend.hpp> #include <mbgl/renderer/renderer_observer.hpp> -#include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/shared_thread_pool.hpp> #include <mbgl/util/util.hpp> @@ -27,9 +26,7 @@ class QMapboxGLMapRenderer : public QObject Q_OBJECT public: - QMapboxGLMapRenderer(qreal pixelRatio, mbgl::DefaultFileSource &, - mbgl::ThreadPool &, QMapboxGLSettings::GLContextMode, - const QString &localFontFamily); + QMapboxGLMapRenderer(qreal pixelRatio, mbgl::ThreadPool &, QMapboxGLSettings::GLContextMode, const QString &localFontFamily); virtual ~QMapboxGLMapRenderer(); void render(); diff --git a/platform/qt/src/qmapboxgl_renderer_backend.hpp b/platform/qt/src/qmapboxgl_renderer_backend.hpp index de66b035fc..476b3502c1 100644 --- a/platform/qt/src/qmapboxgl_renderer_backend.hpp +++ b/platform/qt/src/qmapboxgl_renderer_backend.hpp @@ -3,7 +3,6 @@ #include "qmapboxgl.hpp" #include <mbgl/renderer/renderer_backend.hpp> -#include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/shared_thread_pool.hpp> class QMapboxGLRendererBackend : public mbgl::RendererBackend |