summaryrefslogtreecommitdiff
path: root/platform/qt
diff options
context:
space:
mode:
Diffstat (limited to 'platform/qt')
-rw-r--r--platform/qt/src/qmapboxgl.cpp1
-rw-r--r--platform/qt/src/qmapboxgl_p.hpp8
-rw-r--r--platform/qt/src/qmapboxgl_renderer_frontend_p.cpp7
-rw-r--r--platform/qt/src/qmapboxgl_renderer_frontend_p.hpp4
4 files changed, 6 insertions, 14 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 6faffb5ffb..eeb0bece12 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -1502,7 +1502,6 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin
frontend = std::make_unique<QMapboxGLRendererFrontend>(
std::make_unique<mbgl::Renderer>(*this, pixelRatio, *fileSourceObj, *threadPool,
static_cast<mbgl::GLContextMode>(settings.contextMode())),
- *this,
*this);
connect(frontend.get(), SIGNAL(updated()), this, SLOT(invalidate()));
diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp
index 0fa9f6e8e4..7b0dd8c192 100644
--- a/platform/qt/src/qmapboxgl_p.hpp
+++ b/platform/qt/src/qmapboxgl_p.hpp
@@ -4,7 +4,6 @@
#include "qmapboxgl_renderer_frontend_p.hpp"
#include <mbgl/map/map.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>
@@ -13,7 +12,7 @@
#include <QObject>
#include <QSize>
-class QMapboxGLPrivate : public QObject, public mbgl::View, public mbgl::RendererBackend, public mbgl::MapObserver
+class QMapboxGLPrivate : public QObject, public mbgl::RendererBackend, public mbgl::MapObserver
{
Q_OBJECT
@@ -23,11 +22,8 @@ public:
mbgl::Size framebufferSize() const;
-
- // mbgl::View implementation.
- void bind() final;
-
// mbgl::RendererBackend implementation.
+ void bind() final;
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 d7d9e9c7b7..ea60851eb4 100644
--- a/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp
+++ b/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp
@@ -3,10 +3,9 @@
#include <mbgl/renderer/backend_scope.hpp>
#include <mbgl/renderer/renderer.hpp>
-QMapboxGLRendererFrontend::QMapboxGLRendererFrontend(std::unique_ptr<mbgl::Renderer> renderer_, mbgl::RendererBackend& backend_, mbgl::View& view_)
+QMapboxGLRendererFrontend::QMapboxGLRendererFrontend(std::unique_ptr<mbgl::Renderer> renderer_, mbgl::RendererBackend& backend_)
: renderer(std::move(renderer_))
- , backend(backend_)
- , view(view_) {
+ , backend(backend_) {
}
QMapboxGLRendererFrontend::~QMapboxGLRendererFrontend() = default;
@@ -34,5 +33,5 @@ void QMapboxGLRendererFrontend::render() {
// The OpenGL implementation automatically enables the OpenGL context for us.
mbgl::BackendScope scope { backend, mbgl::BackendScope::ScopeType::Implicit };
- renderer->render(view, *updateParameters);
+ renderer->render(*updateParameters);
}
diff --git a/platform/qt/src/qmapboxgl_renderer_frontend_p.hpp b/platform/qt/src/qmapboxgl_renderer_frontend_p.hpp
index d7e414e5f9..c5e2bacc34 100644
--- a/platform/qt/src/qmapboxgl_renderer_frontend_p.hpp
+++ b/platform/qt/src/qmapboxgl_renderer_frontend_p.hpp
@@ -6,7 +6,6 @@
#include <QObject>
namespace mbgl {
- class View;
class Renderer;
} // namespace mbgl
@@ -15,7 +14,7 @@ class QMapboxGLRendererFrontend : public QObject, public mbgl::RendererFrontend
Q_OBJECT
public:
- explicit QMapboxGLRendererFrontend(std::unique_ptr<mbgl::Renderer>, mbgl::RendererBackend&, mbgl::View&);
+ explicit QMapboxGLRendererFrontend(std::unique_ptr<mbgl::Renderer>, mbgl::RendererBackend&);
~QMapboxGLRendererFrontend() override;
void reset() override;
@@ -32,6 +31,5 @@ signals:
private:
std::unique_ptr<mbgl::Renderer> renderer;
mbgl::RendererBackend& backend;
- mbgl::View& view;
std::shared_ptr<mbgl::UpdateParameters> updateParameters;
};