summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-10-20 16:37:15 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-12-21 08:45:08 -0800
commit8a0dee6ebd000a0e95a16433a34dc243d430ccd6 (patch)
treebf5dc9aff6a9e94e2459012b72755046732d17f3 /src
parentf6985cf6ffe0557d4b8a9360ef351d1668c8974c (diff)
downloadqtlocation-mapboxgl-8a0dee6ebd000a0e95a16433a34dc243d430ccd6.tar.gz
[core] Remove unused BucketParameter members
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/bucket_parameters.hpp30
-rw-r--r--src/mbgl/tile/geometry_tile_worker.cpp8
2 files changed, 8 insertions, 30 deletions
diff --git a/src/mbgl/style/bucket_parameters.hpp b/src/mbgl/style/bucket_parameters.hpp
index 2b16db7625..d5e05c5dd2 100644
--- a/src/mbgl/style/bucket_parameters.hpp
+++ b/src/mbgl/style/bucket_parameters.hpp
@@ -9,42 +9,26 @@
namespace mbgl {
-class TileID;
class GeometryTileLayer;
class GeometryTileFeature;
-class GlyphAtlas;
-class CollisionTile;
class FeatureIndex;
namespace style {
class BucketParameters {
public:
- BucketParameters(const OverscaledTileID& tileID_,
- const std::atomic<bool>& obsolete_,
- uintptr_t tileUID_,
- GlyphAtlas& glyphAtlas_,
- FeatureIndex& featureIndex_,
- const MapMode mode_)
- : tileID(tileID_),
- obsolete(obsolete_),
- tileUID(tileUID_),
- glyphAtlas(glyphAtlas_),
- featureIndex(featureIndex_),
- mode(mode_) {}
+ const OverscaledTileID& tileID;
+ const std::atomic<bool>& obsolete;
+ FeatureIndex& featureIndex;
+ const MapMode mode;
bool cancelled() const {
return obsolete;
}
- void eachFilteredFeature(const Filter&, const GeometryTileLayer&, std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)>);
-
- const OverscaledTileID& tileID;
- const std::atomic<bool>& obsolete;
- uintptr_t tileUID;
- GlyphAtlas& glyphAtlas;
- FeatureIndex& featureIndex;
- const MapMode mode;
+ void eachFilteredFeature(const Filter&,
+ const GeometryTileLayer&,
+ std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)>);
};
} // namespace style
diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp
index e6aaf05d1a..beebebd262 100644
--- a/src/mbgl/tile/geometry_tile_worker.cpp
+++ b/src/mbgl/tile/geometry_tile_worker.cpp
@@ -209,13 +209,7 @@ void GeometryTileWorker::redoLayout() {
std::unordered_set<std::string> parsed;
std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
auto featureIndex = std::make_unique<FeatureIndex>();
-
- BucketParameters parameters(id,
- obsolete,
- reinterpret_cast<uintptr_t>(this),
- glyphAtlas,
- *featureIndex,
- mode);
+ BucketParameters parameters { id, obsolete, *featureIndex, mode };
for (auto i = layers->rbegin(); i != layers->rend(); i++) {
if (obsolete) {