diff options
author | Juha Alanen <juha.alanen@mapbox.com> | 2019-09-17 15:40:01 +0300 |
---|---|---|
committer | Juha Alanen <19551460+jmalanen@users.noreply.github.com> | 2019-09-18 14:29:15 +0300 |
commit | 6b13c42314f28e3b27111367c4f3296c3c3c1248 (patch) | |
tree | 2f91aae637e2c49bb55cfc336f772ac772ab5a2d /src/mbgl/renderer/sources | |
parent | 0042f0b9f5de7151f14300f02a559b6ecb48a507 (diff) | |
download | qtlocation-mapboxgl-6b13c42314f28e3b27111367c4f3296c3c3c1248.tar.gz |
[build] Fix clang format and tidy checks
Diffstat (limited to 'src/mbgl/renderer/sources')
-rw-r--r-- | src/mbgl/renderer/sources/render_tile_source.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_tile_source.hpp | 19 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/mbgl/renderer/sources/render_tile_source.cpp b/src/mbgl/renderer/sources/render_tile_source.cpp index 3c6eff0855..221f976c50 100644 --- a/src/mbgl/renderer/sources/render_tile_source.cpp +++ b/src/mbgl/renderer/sources/render_tile_source.cpp @@ -134,14 +134,12 @@ std::vector<Feature> RenderTileSource::querySourceFeatures(const SourceQueryOpti return tilePyramid.querySourceFeatures(options); } -void RenderTileSource::setFeatureState(const optional<std::string>& sourceLayerID, - const std::string& featureID, +void RenderTileSource::setFeatureState(const optional<std::string>& sourceLayerID, const std::string& featureID, const FeatureState& state) { featureState.updateState(sourceLayerID, featureID, state); } -void RenderTileSource::getFeatureState(FeatureState& state, - const optional<std::string>& sourceLayerID, +void RenderTileSource::getFeatureState(FeatureState& state, const optional<std::string>& sourceLayerID, const std::string& featureID) const { featureState.getState(state, sourceLayerID, featureID); } diff --git a/src/mbgl/renderer/sources/render_tile_source.hpp b/src/mbgl/renderer/sources/render_tile_source.hpp index 48eea8558c..7756bd8ed0 100644 --- a/src/mbgl/renderer/sources/render_tile_source.hpp +++ b/src/mbgl/renderer/sources/render_tile_source.hpp @@ -1,9 +1,9 @@ #pragma once #include <mbgl/renderer/render_source.hpp> +#include <mbgl/renderer/source_state.hpp> #include <mbgl/renderer/tile_pyramid.hpp> #include <mbgl/style/sources/vector_source_impl.hpp> -#include <mbgl/renderer/source_state.hpp> namespace mbgl { @@ -35,17 +35,12 @@ public: std::vector<Feature> querySourceFeatures(const SourceQueryOptions&) const override; - virtual void setFeatureState(const optional<std::string>&, - const std::string&, - const FeatureState&) override; + void setFeatureState(const optional<std::string>&, const std::string&, const FeatureState&) override; - virtual void getFeatureState(FeatureState& state, - const optional<std::string>&, - const std::string&) const override; + void getFeatureState(FeatureState& state, const optional<std::string>&, const std::string&) const override; - virtual void removeFeatureState(const optional<std::string>&, - const optional<std::string>&, - const optional<std::string>&) override; + void removeFeatureState(const optional<std::string>&, const optional<std::string>&, + const optional<std::string>&) override; void reduceMemoryUse() override; void dumpDebugLogs() const override; @@ -56,7 +51,9 @@ protected: Immutable<std::vector<RenderTile>> renderTiles; mutable RenderTiles filteredRenderTiles; mutable RenderTiles renderTilesSortedByY; - float bearing = 0.0f; + +private: + float bearing = 0.0F; SourceFeatureState featureState; }; |