summaryrefslogtreecommitdiff
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
commit63ef5298cd70ce720a6c1289435b5043517b6f30 (patch)
treed22894e13fd2a22625bf8588bff57e42380d42ad
parent47b8fc703b90404b56ba51a5013cf2e42674992d (diff)
downloadqtlocation-mapboxgl-63ef5298cd70ce720a6c1289435b5043517b6f30.tar.gz
[core] Fix modernize-use-override errors in header files
As reported by clang-tidy-8.
-rw-r--r--include/mbgl/style/expression/number_format.hpp2
-rw-r--r--include/mbgl/style/layers/background_layer.hpp2
-rw-r--r--include/mbgl/style/layers/circle_layer.hpp2
-rw-r--r--include/mbgl/style/layers/fill_extrusion_layer.hpp2
-rw-r--r--include/mbgl/style/layers/fill_layer.hpp2
-rw-r--r--include/mbgl/style/layers/heatmap_layer.hpp2
-rw-r--r--include/mbgl/style/layers/hillshade_layer.hpp2
-rw-r--r--include/mbgl/style/layers/layer.hpp.ejs2
-rw-r--r--include/mbgl/style/layers/line_layer.hpp2
-rw-r--r--include/mbgl/style/layers/location_indicator_layer.hpp2
-rw-r--r--include/mbgl/style/layers/raster_layer.hpp2
-rw-r--r--include/mbgl/style/layers/symbol_layer.hpp2
-rw-r--r--src/mbgl/gfx/offscreen_texture.hpp2
-rw-r--r--src/mbgl/gl/index_buffer_resource.hpp2
-rw-r--r--src/mbgl/gl/texture_resource.hpp2
-rw-r--r--src/mbgl/gl/vertex_buffer_resource.hpp2
-rw-r--r--src/mbgl/renderer/render_source.hpp2
17 files changed, 17 insertions, 17 deletions
diff --git a/include/mbgl/style/expression/number_format.hpp b/include/mbgl/style/expression/number_format.hpp
index 9571c7d98a..288c144f2f 100644
--- a/include/mbgl/style/expression/number_format.hpp
+++ b/include/mbgl/style/expression/number_format.hpp
@@ -15,7 +15,7 @@ public:
std::unique_ptr<Expression> minFractionDigits_,
std::unique_ptr<Expression> maxFractionDigits_);
- ~NumberFormat();
+ ~NumberFormat() override;
static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx);
diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
index 4143f23126..6217484dca 100644
--- a/include/mbgl/style/layers/background_layer.hpp
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -17,7 +17,7 @@ class TransitionOptions;
class BackgroundLayer final : public Layer {
public:
BackgroundLayer(const std::string& layerID);
- ~BackgroundLayer() final;
+ ~BackgroundLayer() override;
// Paint properties
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
index 370d2aa8ba..bb1ccbfae8 100644
--- a/include/mbgl/style/layers/circle_layer.hpp
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -17,7 +17,7 @@ class TransitionOptions;
class CircleLayer final : public Layer {
public:
CircleLayer(const std::string& layerID, const std::string& sourceID);
- ~CircleLayer() final;
+ ~CircleLayer() override;
// Layout properties
diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp
index a62a8a0fdb..e823e63b84 100644
--- a/include/mbgl/style/layers/fill_extrusion_layer.hpp
+++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp
@@ -17,7 +17,7 @@ class TransitionOptions;
class FillExtrusionLayer final : public Layer {
public:
FillExtrusionLayer(const std::string& layerID, const std::string& sourceID);
- ~FillExtrusionLayer() final;
+ ~FillExtrusionLayer() override;
// Paint properties
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index 3c3c54220e..a5f61a0c88 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -17,7 +17,7 @@ class TransitionOptions;
class FillLayer final : public Layer {
public:
FillLayer(const std::string& layerID, const std::string& sourceID);
- ~FillLayer() final;
+ ~FillLayer() override;
// Layout properties
diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp
index ec6c39766f..cbe353a6c4 100644
--- a/include/mbgl/style/layers/heatmap_layer.hpp
+++ b/include/mbgl/style/layers/heatmap_layer.hpp
@@ -18,7 +18,7 @@ class TransitionOptions;
class HeatmapLayer final : public Layer {
public:
HeatmapLayer(const std::string& layerID, const std::string& sourceID);
- ~HeatmapLayer() final;
+ ~HeatmapLayer() override;
// Paint properties
diff --git a/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp
index 7848182652..2f50f92640 100644
--- a/include/mbgl/style/layers/hillshade_layer.hpp
+++ b/include/mbgl/style/layers/hillshade_layer.hpp
@@ -17,7 +17,7 @@ class TransitionOptions;
class HillshadeLayer final : public Layer {
public:
HillshadeLayer(const std::string& layerID, const std::string& sourceID);
- ~HillshadeLayer() final;
+ ~HillshadeLayer() override;
// Paint properties
diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs
index 1a0f557e92..114fb1e346 100644
--- a/include/mbgl/style/layers/layer.hpp.ejs
+++ b/include/mbgl/style/layers/layer.hpp.ejs
@@ -39,7 +39,7 @@ public:
<% } else { -%>
<%- camelize(type) %>Layer(const std::string& layerID, const std::string& sourceID);
<% } -%>
- ~<%- camelize(type) %>Layer() final;
+ ~<%- camelize(type) %>Layer() override;
<% if (layoutProperties.length) { -%>
// Layout properties
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
index 13a58f45da..1f3e8b04c2 100644
--- a/include/mbgl/style/layers/line_layer.hpp
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -20,7 +20,7 @@ class TransitionOptions;
class LineLayer final : public Layer {
public:
LineLayer(const std::string& layerID, const std::string& sourceID);
- ~LineLayer() final;
+ ~LineLayer() override;
// Layout properties
diff --git a/include/mbgl/style/layers/location_indicator_layer.hpp b/include/mbgl/style/layers/location_indicator_layer.hpp
index fcf688fb99..8d70bc18d3 100644
--- a/include/mbgl/style/layers/location_indicator_layer.hpp
+++ b/include/mbgl/style/layers/location_indicator_layer.hpp
@@ -18,7 +18,7 @@ class TransitionOptions;
class LocationIndicatorLayer final : public Layer {
public:
LocationIndicatorLayer(const std::string& layerID);
- ~LocationIndicatorLayer();
+ ~LocationIndicatorLayer() override;
// Layout properties
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index 3ccda2d683..2f10b7cbea 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -17,7 +17,7 @@ class TransitionOptions;
class RasterLayer final : public Layer {
public:
RasterLayer(const std::string& layerID, const std::string& sourceID);
- ~RasterLayer() final;
+ ~RasterLayer() override;
// Paint properties
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 355299ce5c..df54b7ad0b 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -20,7 +20,7 @@ class TransitionOptions;
class SymbolLayer final : public Layer {
public:
SymbolLayer(const std::string& layerID, const std::string& sourceID);
- ~SymbolLayer() final;
+ ~SymbolLayer() override;
// Layout properties
diff --git a/src/mbgl/gfx/offscreen_texture.hpp b/src/mbgl/gfx/offscreen_texture.hpp
index 5690ff7625..d4bf5149fd 100644
--- a/src/mbgl/gfx/offscreen_texture.hpp
+++ b/src/mbgl/gfx/offscreen_texture.hpp
@@ -15,7 +15,7 @@ protected:
}
public:
- virtual ~OffscreenTexture() = default;
+ ~OffscreenTexture() override = default;
virtual bool isRenderable() = 0;
diff --git a/src/mbgl/gl/index_buffer_resource.hpp b/src/mbgl/gl/index_buffer_resource.hpp
index 00c66be5b5..4187994a22 100644
--- a/src/mbgl/gl/index_buffer_resource.hpp
+++ b/src/mbgl/gl/index_buffer_resource.hpp
@@ -9,7 +9,7 @@ namespace gl {
class IndexBufferResource : public gfx::IndexBufferResource {
public:
IndexBufferResource(UniqueBuffer&& buffer_, int byteSize_) : buffer(std::move(buffer_)), byteSize(byteSize_) {}
- ~IndexBufferResource();
+ ~IndexBufferResource() override;
UniqueBuffer buffer;
int byteSize;
diff --git a/src/mbgl/gl/texture_resource.hpp b/src/mbgl/gl/texture_resource.hpp
index 494e5ae8a3..fd4f69084f 100644
--- a/src/mbgl/gl/texture_resource.hpp
+++ b/src/mbgl/gl/texture_resource.hpp
@@ -9,7 +9,7 @@ namespace gl {
class TextureResource : public gfx::TextureResource {
public:
TextureResource(UniqueTexture&& texture_, int byteSize_) : texture(std::move(texture_)), byteSize(byteSize_) {}
- ~TextureResource();
+ ~TextureResource() override;
static int getStorageSize(const Size& size, gfx::TexturePixelType format, gfx::TextureChannelDataType type);
diff --git a/src/mbgl/gl/vertex_buffer_resource.hpp b/src/mbgl/gl/vertex_buffer_resource.hpp
index f9c599c757..cbd73482a3 100644
--- a/src/mbgl/gl/vertex_buffer_resource.hpp
+++ b/src/mbgl/gl/vertex_buffer_resource.hpp
@@ -9,7 +9,7 @@ namespace gl {
class VertexBufferResource : public gfx::VertexBufferResource {
public:
VertexBufferResource(UniqueBuffer&& buffer_, int byteSize_) : buffer(std::move(buffer_)), byteSize(byteSize_) {}
- ~VertexBufferResource();
+ ~VertexBufferResource() override;
UniqueBuffer buffer;
int byteSize;
diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp
index 5b6c9de1b7..8e09b46931 100644
--- a/src/mbgl/renderer/render_source.hpp
+++ b/src/mbgl/renderer/render_source.hpp
@@ -48,7 +48,7 @@ using RenderTiles = std::shared_ptr<const std::vector<std::reference_wrapper<con
class RenderSource : protected TileObserver {
public:
static std::unique_ptr<RenderSource> create(const Immutable<style::Source::Impl>&);
- virtual ~RenderSource();
+ ~RenderSource() override;
bool isEnabled() const;
virtual bool isLoaded() const = 0;