diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-21 16:36:31 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-25 12:17:00 -0700 |
commit | 8ea2b78b8a06107d84436873256c52309e6ebb7e (patch) | |
tree | b29cb24b6db45cee0124ba92d8157d00c8f4a516 /platform/qt/src/qmapboxgl_p.hpp | |
parent | f49e0f97e21d19f11d74057184713f568cea170b (diff) | |
download | qtlocation-mapboxgl-upstream/headless-frontend.tar.gz |
[all] Merge View into RendererBackendupstream/headless-frontend
Diffstat (limited to 'platform/qt/src/qmapboxgl_p.hpp')
-rw-r--r-- | platform/qt/src/qmapboxgl_p.hpp | 8 |
1 files changed, 2 insertions, 6 deletions
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 {} |