summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-03-23 14:49:03 +0100
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-04-28 14:32:18 -0400
commit7c8c45edabf3407fd5084d896fea685c53fa1a89 (patch)
treea0c4dc353f3c769c36fe5d19a67d1b9d7103d315 /include
parent89167cbf8c98a1167ee86ddb49cc5c4c1a4a9182 (diff)
downloadqtlocation-mapboxgl-7c8c45edabf3407fd5084d896fea685c53fa1a89.tar.gz
move activeSources to internal Map context
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/map/map.hpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index f1e3924fd3..944781e58a 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -26,10 +26,8 @@ namespace mbgl {
class Painter;
class GlyphStore;
-class LayerDescription;
class Sprite;
class Style;
-class StyleLayer;
class TexturePool;
class FileSource;
class View;
@@ -38,11 +36,11 @@ class SpriteAtlas;
class LineAtlas;
class Environment;
class EnvironmentScope;
-class AnnotationManager;
class MapData;
class Worker;
class StillImage;
class TileID;
+class MapContext;
class Map : private util::noncopyable {
friend class View;
@@ -220,6 +218,7 @@ private:
std::unique_ptr<EnvironmentScope> scope;
View &view;
const std::unique_ptr<MapData> data;
+ const std::unique_ptr<MapContext> context;
private:
std::unique_ptr<Worker> workers;