summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-27 18:30:35 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2020-04-17 13:36:50 +0300
commitdffe00feeade4d65d10deecdc196add14b791c11 (patch)
treec0b834bf8e6f44e37b5d01af87c044bdf91c7079 /src/mbgl/renderer
parent2eebd7170aa72168df1d963422d256411fc4f5ef (diff)
downloadqtlocation-mapboxgl-dffe00feeade4d65d10deecdc196add14b791c11.tar.gz
[core] Fix readability-avoid-const-params-in-decls errors in header files
As reported by clang-tidy-8.
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r--src/mbgl/renderer/buckets/circle_bucket.hpp4
-rw-r--r--src/mbgl/renderer/buckets/fill_bucket.hpp4
-rw-r--r--src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp4
-rw-r--r--src/mbgl/renderer/buckets/line_bucket.hpp4
-rw-r--r--src/mbgl/renderer/buckets/symbol_bucket.hpp7
-rw-r--r--src/mbgl/renderer/layers/render_circle_layer.hpp9
-rw-r--r--src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp9
-rw-r--r--src/mbgl/renderer/layers/render_fill_layer.hpp9
-rw-r--r--src/mbgl/renderer/layers/render_heatmap_layer.hpp9
-rw-r--r--src/mbgl/renderer/layers/render_line_layer.hpp11
-rw-r--r--src/mbgl/renderer/render_tile.hpp2
11 files changed, 48 insertions, 24 deletions
diff --git a/src/mbgl/renderer/buckets/circle_bucket.hpp b/src/mbgl/renderer/buckets/circle_bucket.hpp
index 221deb5f17..1abd9c77f6 100644
--- a/src/mbgl/renderer/buckets/circle_bucket.hpp
+++ b/src/mbgl/renderer/buckets/circle_bucket.hpp
@@ -18,8 +18,8 @@ public:
using PossiblyEvaluatedLayoutProperties = style::CircleLayoutProperties::PossiblyEvaluated;
CircleBucket(const std::map<std::string, Immutable<style::LayerProperties>>& layerPaintProperties,
- const MapMode mode,
- const float zoom);
+ MapMode mode,
+ float zoom);
~CircleBucket() override;
bool hasData() const override;
diff --git a/src/mbgl/renderer/buckets/fill_bucket.hpp b/src/mbgl/renderer/buckets/fill_bucket.hpp
index baa605a299..2812e1fde0 100644
--- a/src/mbgl/renderer/buckets/fill_bucket.hpp
+++ b/src/mbgl/renderer/buckets/fill_bucket.hpp
@@ -22,8 +22,8 @@ public:
FillBucket(const PossiblyEvaluatedLayoutProperties& layout,
const std::map<std::string, Immutable<style::LayerProperties>>& layerPaintProperties,
- const float zoom,
- const uint32_t overscaling);
+ float zoom,
+ uint32_t overscaling);
void addFeature(const GeometryTileFeature&,
const GeometryCollection&,
diff --git a/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp b/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp
index 833eee7a73..7143d4326d 100644
--- a/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp
+++ b/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp
@@ -21,8 +21,8 @@ public:
FillExtrusionBucket(const PossiblyEvaluatedLayoutProperties&,
const std::map<std::string, Immutable<style::LayerProperties>>&,
- const float,
- const uint32_t);
+ float,
+ uint32_t);
void addFeature(const GeometryTileFeature&,
const GeometryCollection&,
diff --git a/src/mbgl/renderer/buckets/line_bucket.hpp b/src/mbgl/renderer/buckets/line_bucket.hpp
index 86aa91160c..48092f41c0 100644
--- a/src/mbgl/renderer/buckets/line_bucket.hpp
+++ b/src/mbgl/renderer/buckets/line_bucket.hpp
@@ -21,8 +21,8 @@ public:
LineBucket(PossiblyEvaluatedLayoutProperties layout,
const std::map<std::string, Immutable<style::LayerProperties>>& layerPaintProperties,
- const float zoom,
- const uint32_t overscaling);
+ float zoom,
+ uint32_t overscaling);
~LineBucket() override;
void addFeature(const GeometryTileFeature&,
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp
index 5577eac2d9..c6a07dde1c 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.hpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp
@@ -75,7 +75,7 @@ public:
std::string bucketName_,
const std::vector<SymbolInstance>&&,
const std::vector<SortKeyRange>&&,
- const float tilePixelRatio,
+ float tilePixelRatio,
bool allowVerticalPlacement,
std::vector<style::TextWritingModeType> placementModes,
bool iconsInText);
@@ -96,10 +96,9 @@ public:
bool hasTextCollisionCircleData() const;
bool hasFormatSectionOverrides() const;
-
- void sortFeatures(const float angle);
+ void sortFeatures(float angle);
// Returns references to the `symbolInstances` items, sorted by viewport Y.
- SymbolInstanceReferences getSortedSymbols(const float angle) const;
+ SymbolInstanceReferences getSortedSymbols(float angle) const;
// Returns references to the `symbolInstances` items, which belong to the `sortKeyRange` range;
// returns references to all the symbols if |sortKeyRange| is `nullopt`.
SymbolInstanceReferences getSymbols(const optional<SortKeyRange>& sortKeyRange = nullopt) const;
diff --git a/src/mbgl/renderer/layers/render_circle_layer.hpp b/src/mbgl/renderer/layers/render_circle_layer.hpp
index 70af20f0cf..d551e9e37d 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.hpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.hpp
@@ -18,8 +18,13 @@ private:
bool hasCrossfade() const override;
void render(PaintParameters&) override;
- bool queryIntersectsFeature(const GeometryCoordinates&, const GeometryTileFeature&, const float,
- const TransformState&, const float, const mat4&, const FeatureState&) const override;
+ bool queryIntersectsFeature(const GeometryCoordinates&,
+ const GeometryTileFeature&,
+ float,
+ const TransformState&,
+ float,
+ const mat4&,
+ const FeatureState&) const override;
// Paint properties
style::CirclePaintProperties::Unevaluated unevaluated;
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp
index 0e6a747c71..558ea8cdb0 100644
--- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp
+++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp
@@ -20,8 +20,13 @@ private:
bool is3D() const override;
void render(PaintParameters&) override;
- bool queryIntersectsFeature(const GeometryCoordinates&, const GeometryTileFeature&, const float,
- const TransformState&, const float, const mat4&, const FeatureState&) const override;
+ bool queryIntersectsFeature(const GeometryCoordinates&,
+ const GeometryTileFeature&,
+ float,
+ const TransformState&,
+ float,
+ const mat4&,
+ const FeatureState&) const override;
// Paint properties
style::FillExtrusionPaintProperties::Unevaluated unevaluated;
diff --git a/src/mbgl/renderer/layers/render_fill_layer.hpp b/src/mbgl/renderer/layers/render_fill_layer.hpp
index 12484dbfb1..f3ef9ab66e 100644
--- a/src/mbgl/renderer/layers/render_fill_layer.hpp
+++ b/src/mbgl/renderer/layers/render_fill_layer.hpp
@@ -21,8 +21,13 @@ private:
bool hasCrossfade() const override;
void render(PaintParameters&) override;
- bool queryIntersectsFeature(const GeometryCoordinates&, const GeometryTileFeature&, const float,
- const TransformState&, const float, const mat4&, const FeatureState&) const override;
+ bool queryIntersectsFeature(const GeometryCoordinates&,
+ const GeometryTileFeature&,
+ float,
+ const TransformState&,
+ float,
+ const mat4&,
+ const FeatureState&) const override;
// Paint properties
style::FillPaintProperties::Unevaluated unevaluated;
diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.hpp b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
index b7a03a6ba5..7085a87c90 100644
--- a/src/mbgl/renderer/layers/render_heatmap_layer.hpp
+++ b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
@@ -23,8 +23,13 @@ private:
void upload(gfx::UploadPass&) override;
void render(PaintParameters&) override;
- bool queryIntersectsFeature(const GeometryCoordinates&, const GeometryTileFeature&, const float,
- const TransformState&, const float, const mat4&, const FeatureState&) const override;
+ bool queryIntersectsFeature(const GeometryCoordinates&,
+ const GeometryTileFeature&,
+ float,
+ const TransformState&,
+ float,
+ const mat4&,
+ const FeatureState&) const override;
void updateColorRamp();
// Paint properties
diff --git a/src/mbgl/renderer/layers/render_line_layer.hpp b/src/mbgl/renderer/layers/render_line_layer.hpp
index 1914a82b77..fb5d64fcb2 100644
--- a/src/mbgl/renderer/layers/render_line_layer.hpp
+++ b/src/mbgl/renderer/layers/render_line_layer.hpp
@@ -24,13 +24,18 @@ private:
void upload(gfx::UploadPass&) override;
void render(PaintParameters&) override;
- bool queryIntersectsFeature(const GeometryCoordinates&, const GeometryTileFeature&, const float,
- const TransformState&, const float, const mat4&, const FeatureState&) const override;
+ bool queryIntersectsFeature(const GeometryCoordinates&,
+ const GeometryTileFeature&,
+ float,
+ const TransformState&,
+ float,
+ const mat4&,
+ const FeatureState&) const override;
// Paint properties
style::LinePaintProperties::Unevaluated unevaluated;
- float getLineWidth(const GeometryTileFeature&, const float, const FeatureState&) const;
+ float getLineWidth(const GeometryTileFeature&, float, const FeatureState&) const;
void updateColorRamp();
PremultipliedImage colorRamp;
diff --git a/src/mbgl/renderer/render_tile.hpp b/src/mbgl/renderer/render_tile.hpp
index 448d449984..f2ea1a22c2 100644
--- a/src/mbgl/renderer/render_tile.hpp
+++ b/src/mbgl/renderer/render_tile.hpp
@@ -66,7 +66,7 @@ public:
const std::array<float, 2>& translation,
style::TranslateAnchorType anchor,
const TransformState& state,
- const bool inViewportPixelUnits) const;
+ bool inViewportPixelUnits) const;
void setFeatureState(const LayerFeatureStates&);