diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-04-03 12:27:14 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-04-05 11:49:17 +0200 |
commit | 3ceabcd3ec91dbd9458d3c5b78fb12c3182636e1 (patch) | |
tree | b8be2ac790afce844178a314b42683ab9d06f744 /src/mbgl/text | |
parent | d7aaf83421261087a99d18d92eca9637c1bf72f8 (diff) | |
download | qtlocation-mapboxgl-3ceabcd3ec91dbd9458d3c5b78fb12c3182636e1.tar.gz |
[core] clang-tidy fixes
Diffstat (limited to 'src/mbgl/text')
-rw-r--r-- | src/mbgl/text/cross_tile_symbol_index.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/text/language_tag.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/text/placement.cpp | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/text/cross_tile_symbol_index.cpp b/src/mbgl/text/cross_tile_symbol_index.cpp index 0992433ccb..5170bfad75 100644 --- a/src/mbgl/text/cross_tile_symbol_index.cpp +++ b/src/mbgl/text/cross_tile_symbol_index.cpp @@ -59,8 +59,7 @@ void TileLayerIndex::findMatches(std::vector<SymbolInstance>& symbolInstances, c } } -CrossTileSymbolLayerIndex::CrossTileSymbolLayerIndex() { -} +CrossTileSymbolLayerIndex::CrossTileSymbolLayerIndex() = default; /* * Sometimes when a user pans across the antimeridian the longitude value gets wrapped. @@ -163,7 +162,7 @@ bool CrossTileSymbolLayerIndex::removeStaleBuckets(const std::unordered_set<uint return tilesChanged; } -CrossTileSymbolIndex::CrossTileSymbolIndex() {} +CrossTileSymbolIndex::CrossTileSymbolIndex() = default; bool CrossTileSymbolIndex::addLayer(const RenderLayerSymbolInterface& symbolInterface, float lng) { diff --git a/src/mbgl/text/language_tag.cpp b/src/mbgl/text/language_tag.cpp index 90d2f26e16..bd785e4089 100644 --- a/src/mbgl/text/language_tag.cpp +++ b/src/mbgl/text/language_tag.cpp @@ -185,8 +185,8 @@ struct bcp47_parser : qi::grammar<Iterator> }; LanguageTag LanguageTag::fromBCP47(const std::string& bcp47Tag) { - typedef std::string::const_iterator iterator_type; - typedef bcp47_parser<iterator_type> bcp47_parser; + using iterator_type = std::string::const_iterator; + using bcp47_parser = bcp47_parser<iterator_type>; bcp47_parser parser; std::string::const_iterator iter = bcp47Tag.begin(); diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp index f6c4ac1eb6..16295256c5 100644 --- a/src/mbgl/text/placement.cpp +++ b/src/mbgl/text/placement.cpp @@ -8,6 +8,7 @@ #include <mbgl/renderer/buckets/symbol_bucket.hpp> #include <mbgl/renderer/bucket.hpp> #include <mbgl/util/math.hpp> +#include <utility> namespace mbgl { @@ -62,7 +63,7 @@ Placement::Placement(const TransformState& state_, MapMode mapMode_, style::Tran : collisionIndex(state_) , state(state_) , mapMode(mapMode_) - , transitionOptions(transitionOptions_) + , transitionOptions(std::move(transitionOptions_)) , collisionGroups(crossSourceCollisions) , prevPlacement(std::move(prevPlacement_)) { @@ -80,7 +81,7 @@ void Placement::placeLayer(const RenderLayerSymbolInterface& symbolInterface, co continue; } assert(renderTile.tile.kind == Tile::Kind::Geometry); - GeometryTile& geometryTile = static_cast<GeometryTile&>(renderTile.tile); + auto& geometryTile = static_cast<GeometryTile&>(renderTile.tile); auto bucket = symbolInterface.getSymbolBucket(renderTile); if (!bucket) { |