summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-03-23 14:53:55 +0100
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-04-28 14:32:18 -0400
commitad0178fd457750555ec2b2009fdcda9061cf41d7 (patch)
tree8412fbb12e09a85ede2f174f30f9834f063c9e64 /include
parentc88a60b1e5691989456d6fda1b33ec22a41994b4 (diff)
downloadqtlocation-mapboxgl-ad0178fd457750555ec2b2009fdcda9061cf41d7.tar.gz
move atlas/painter to map context
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/map/map.hpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 944781e58a..1693832808 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -24,16 +24,12 @@ namespace uv { class async; }
namespace mbgl {
-class Painter;
class GlyphStore;
class Sprite;
class Style;
class TexturePool;
class FileSource;
class View;
-class GlyphAtlas;
-class SpriteAtlas;
-class LineAtlas;
class Environment;
class EnvironmentScope;
class MapData;
@@ -246,14 +242,10 @@ private:
FileSource& fileSource;
- util::ptr<Style> style;
- std::unique_ptr<GlyphAtlas> glyphAtlas;
util::ptr<GlyphStore> glyphStore;
- std::unique_ptr<SpriteAtlas> spriteAtlas;
+ util::ptr<Style> style;
util::ptr<Sprite> sprite;
- std::unique_ptr<LineAtlas> lineAtlas;
util::ptr<TexturePool> texturePool;
- std::unique_ptr<Painter> painter;
std::atomic<UpdateType> updated;