summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-06-13 10:50:16 +0300
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2017-07-18 10:45:12 +0200
commit57351c068b133ed140ac7b991181672019fe5c24 (patch)
tree2a0be8819c2bc57b1cda7d5c6f98e725a030daa2 /include
parente35cbbae55ab01f33690b1bb2e918c5f8393b854 (diff)
downloadqtlocation-mapboxgl-57351c068b133ed140ac7b991181672019fe5c24.tar.gz
[core] split backend from mapobserver
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/map/backend.hpp4
-rw-r--r--include/mbgl/map/map.hpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/include/mbgl/map/backend.hpp b/include/mbgl/map/backend.hpp
index 2e73ad994c..434f68779c 100644
--- a/include/mbgl/map/backend.hpp
+++ b/include/mbgl/map/backend.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include <mbgl/map/map_observer.hpp>
+#include <mbgl/map/view.hpp>
#include <mbgl/util/image.hpp>
#include <mbgl/util/size.hpp>
@@ -17,7 +17,7 @@ using FramebufferID = uint32_t;
class BackendScope;
-class Backend : public MapObserver {
+class Backend {
public:
Backend();
virtual ~Backend();
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index d82a260362..22ac100c40 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -33,6 +33,7 @@ class Style;
class Map : private util::noncopyable {
public:
explicit Map(Backend&,
+ MapObserver&,
Size size,
float pixelRatio,
FileSource&,