summaryrefslogtreecommitdiff
path: root/src/mbgl/map/tile_parser.hpp
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-03-02 17:31:16 -0800
committerJustin R. Miller <incanus@codesorcery.net>2015-03-02 17:31:16 -0800
commit0645300323a387213b43c48f88c3a0b9c200cd06 (patch)
treeb6c56e03f9ff9ad62f7c2ba2350c7ce8405d4c0a /src/mbgl/map/tile_parser.hpp
parent4407033b3bcd22becffce4bfa7a4b92abe7f7782 (diff)
downloadqtlocation-mapboxgl-0645300323a387213b43c48f88c3a0b9c200cd06.tar.gz
move to camelCase & more reference cleanups
Diffstat (limited to 'src/mbgl/map/tile_parser.hpp')
-rw-r--r--src/mbgl/map/tile_parser.hpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mbgl/map/tile_parser.hpp b/src/mbgl/map/tile_parser.hpp
index 28150cbd4b..228557846c 100644
--- a/src/mbgl/map/tile_parser.hpp
+++ b/src/mbgl/map/tile_parser.hpp
@@ -35,7 +35,7 @@ class TexturePool;
class TileParser : private util::noncopyable
{
public:
- TileParser(const std::string& raw_data,
+ TileParser(const std::string& rawData,
VectorTileData& tile,
const util::ptr<const Style>& style,
GlyphAtlas& glyphAtlas,
@@ -51,22 +51,22 @@ private:
bool obsolete() const;
void parseStyleLayers(util::ptr<const StyleLayerGroup> group);
- std::unique_ptr<Bucket> createBucket(const StyleBucket& bucket_desc);
- std::unique_ptr<Bucket> createFillBucket(const VectorTileLayer& layer, const StyleBucket& bucket_desc);
- std::unique_ptr<Bucket> createLineBucket(const VectorTileLayer& layer, const StyleBucket& bucket_desc);
- std::unique_ptr<Bucket> createSymbolBucket(const VectorTileLayer& layer, const StyleBucket& bucket_desc);
+ std::unique_ptr<Bucket> createBucket(const StyleBucket& bucketDesc);
+ std::unique_ptr<Bucket> createFillBucket(const VectorTileLayer& layer, const StyleBucket& bucketDesc);
+ std::unique_ptr<Bucket> createLineBucket(const VectorTileLayer& layer, const StyleBucket& bucketDesc);
+ std::unique_ptr<Bucket> createSymbolBucket(const VectorTileLayer& layer, const StyleBucket& bucketDesc);
template <class Bucket> void addBucketGeometries(Bucket& bucket, const VectorTileLayer& layer, const FilterExpression& filter);
private:
- const VectorTile vector_tile;
+ const VectorTile vectorTile;
VectorTileData& tile;
// Cross-thread shared data.
util::ptr<const Style> style;
- GlyphAtlas & glyphAtlas;
- GlyphStore & glyphStore;
- SpriteAtlas & spriteAtlas;
+ GlyphAtlas& glyphAtlas;
+ GlyphStore& glyphStore;
+ SpriteAtlas& spriteAtlas;
util::ptr<Sprite> sprite;
std::unique_ptr<Collision> collision;