diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-20 16:20:04 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-02 14:36:30 -0800 |
commit | a7b7f3d44297608121dba975586e838f03b6c3c5 (patch) | |
tree | a042500a02ede843fc17b5c278ca3a6f7608876e /src/mbgl/layout | |
parent | c461dad5eecb17d963c5dcce5db9db28e74f0429 (diff) | |
download | qtlocation-mapboxgl-a7b7f3d44297608121dba975586e838f03b6c3c5.tar.gz |
[core] Fix whitespace; no need for explicit on multi-parameter constructors
Diffstat (limited to 'src/mbgl/layout')
-rw-r--r-- | src/mbgl/layout/symbol_instance.cpp | 22 | ||||
-rw-r--r-- | src/mbgl/layout/symbol_instance.hpp | 24 | ||||
-rw-r--r-- | src/mbgl/layout/symbol_layout.hpp | 3 |
3 files changed, 34 insertions, 15 deletions
diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp index d81783b2f6..8bdc528bbb 100644 --- a/src/mbgl/layout/symbol_instance.cpp +++ b/src/mbgl/layout/symbol_instance.cpp @@ -5,12 +5,22 @@ namespace mbgl { using namespace style; -SymbolInstance::SymbolInstance(Anchor& anchor, const GeometryCoordinates& line, - const std::pair<Shaping, Shaping>& shapedTextOrientations, const PositionedIcon& shapedIcon, - const SymbolLayoutProperties::Evaluated& layout, const bool addToBuffers, const uint32_t index_, - const float textBoxScale, const float textPadding, const SymbolPlacementType textPlacement, - const float iconBoxScale, const float iconPadding, const SymbolPlacementType iconPlacement, - const GlyphPositions& face, const IndexedSubfeature& indexedFeature, const std::size_t featureIndex_) : +SymbolInstance::SymbolInstance(Anchor& anchor, + const GeometryCoordinates& line, + const std::pair<Shaping, Shaping>& shapedTextOrientations, + const PositionedIcon& shapedIcon, + const SymbolLayoutProperties::Evaluated& layout, + const bool addToBuffers, + const uint32_t index_, + const float textBoxScale, + const float textPadding, + const SymbolPlacementType textPlacement, + const float iconBoxScale, + const float iconPadding, + const SymbolPlacementType iconPlacement, + const GlyphPositions& face, + const IndexedSubfeature& indexedFeature, + const std::size_t featureIndex_) : point(anchor.point), index(index_), hasText(shapedTextOrientations.first || shapedTextOrientations.second), diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp index 532a4d30d8..70ebfeefa2 100644 --- a/src/mbgl/layout/symbol_instance.hpp +++ b/src/mbgl/layout/symbol_instance.hpp @@ -7,17 +7,27 @@ namespace mbgl { -struct Anchor; +class Anchor; class IndexedSubfeature; class SymbolInstance { public: - explicit SymbolInstance(Anchor& anchor, const GeometryCoordinates& line, - const std::pair<Shaping, Shaping>& shapedTextOrientations, const PositionedIcon& shapedIcon, - const style::SymbolLayoutProperties::Evaluated&, const bool inside, const uint32_t index, - const float textBoxScale, const float textPadding, style::SymbolPlacementType textPlacement, - const float iconBoxScale, const float iconPadding, style::SymbolPlacementType iconPlacement, - const GlyphPositions& face, const IndexedSubfeature& indexedfeature, const std::size_t featureIndex); + SymbolInstance(Anchor& anchor, + const GeometryCoordinates& line, + const std::pair<Shaping, Shaping>& shapedTextOrientations, + const PositionedIcon& shapedIcon, + const style::SymbolLayoutProperties::Evaluated&, + const bool inside, + const uint32_t index, + const float textBoxScale, + const float textPadding, + style::SymbolPlacementType textPlacement, + const float iconBoxScale, + const float iconPadding, + style::SymbolPlacementType iconPlacement, + const GlyphPositions& face, + const IndexedSubfeature&, + const std::size_t featureIndex); Point<float> point; uint32_t index; diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index 491d0078da..c6e1743549 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -19,6 +19,7 @@ class CollisionTile; class SpriteAtlas; class GlyphAtlas; class SymbolBucket; +class Anchor; namespace style { class BucketParameters; @@ -26,8 +27,6 @@ class Filter; class Layer; } // namespace style -struct Anchor; - class SymbolLayout { public: SymbolLayout(const style::BucketParameters&, |