diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2017-04-12 16:34:15 +0300 |
|---|---|---|
| committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-04-19 17:21:28 -0700 |
| commit | d752235ec790f8c2d4e646c32648253ec64a60c4 (patch) | |
| tree | 169ad8a40eb21a11d50805f570dc5dedcccb0990 | |
| parent | 935cf531e43649b6374f7bd59976cf78ab69c522 (diff) | |
| download | qtlocation-mapboxgl-d752235ec790f8c2d4e646c32648253ec64a60c4.tar.gz | |
[core] make Tile::getBucket const
| -rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/tile/raster_tile.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/tile/raster_tile.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/tile/tile.hpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 36ac4155d7..83554ce76a 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -158,7 +158,7 @@ void GeometryTile::getIcons(IconDependencyMap iconDependencyMap) { } } -Bucket* GeometryTile::getBucket(const Layer& layer) { +Bucket* GeometryTile::getBucket(const Layer& layer) const { const auto& buckets = layer.is<SymbolLayer>() ? symbolBuckets : nonSymbolBuckets; const auto it = buckets.find(layer.baseImpl->id); if (it == buckets.end()) { diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 0531917acc..bfd036f3d5 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -46,7 +46,7 @@ public: void getGlyphs(GlyphDependencies); void getIcons(IconDependencyMap); - Bucket* getBucket(const style::Layer&) override; + Bucket* getBucket(const style::Layer&) const override; void queryRenderedFeatures( std::unordered_map<std::string, std::vector<Feature>>& result, diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp index 2347f8c881..887ebb67b8 100644 --- a/src/mbgl/tile/raster_tile.cpp +++ b/src/mbgl/tile/raster_tile.cpp @@ -51,7 +51,7 @@ void RasterTile::onError(std::exception_ptr err) { observer->onTileError(*this, err); } -Bucket* RasterTile::getBucket(const style::Layer&) { +Bucket* RasterTile::getBucket(const style::Layer&) const { return bucket.get(); } diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp index 1f6ceef0db..cc0dbe71de 100644 --- a/src/mbgl/tile/raster_tile.hpp +++ b/src/mbgl/tile/raster_tile.hpp @@ -29,7 +29,7 @@ public: optional<Timestamp> expires_); void cancel() override; - Bucket* getBucket(const style::Layer&) override; + Bucket* getBucket(const style::Layer&) const override; void onParsed(std::unique_ptr<Bucket> result); void onError(std::exception_ptr); diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp index a5f574b567..a8034c40e4 100644 --- a/src/mbgl/tile/tile.hpp +++ b/src/mbgl/tile/tile.hpp @@ -47,7 +47,7 @@ public: // Mark this tile as no longer needed and cancel any pending work. virtual void cancel() = 0; - virtual Bucket* getBucket(const style::Layer&) = 0; + virtual Bucket* getBucket(const style::Layer&) const = 0; virtual void setPlacementConfig(const PlacementConfig&) {} virtual void redoLayout() {} |