summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-12 14:15:16 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-13 23:32:06 +0300
commit4d75001e9af268cca015a46cc0465e39dd4eb971 (patch)
treea768076dca58e7de92d2f788f75cc891eefa7c91
parent4161d197fdb59587b3ef5deac321605fc911a2ab (diff)
downloadqtlocation-mapboxgl-4d75001e9af268cca015a46cc0465e39dd4eb971.tar.gz
[tidy] Check modernize-use-override
Ref: http://clang.llvm.org/extra/clang-tidy/checks/modernize-use-override.html
-rw-r--r--include/mbgl/platform/default/glfw_view.hpp2
-rw-r--r--include/mbgl/platform/default/headless_view.hpp2
-rw-r--r--platform/default/online_file_source.cpp2
-rw-r--r--src/mbgl/annotation/annotation_tile.hpp2
-rw-r--r--src/mbgl/style/observer.hpp2
-rw-r--r--src/mbgl/style/source.hpp2
-rw-r--r--src/mbgl/style/style.hpp2
-rw-r--r--src/mbgl/tile/geometry_tile.hpp2
-rw-r--r--test/src/mbgl/test/fixture_log_observer.hpp4
-rw-r--r--test/src/mbgl/test/stub_file_source.cpp2
10 files changed, 11 insertions, 11 deletions
diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp
index b1204ce96d..83d00a24dd 100644
--- a/include/mbgl/platform/default/glfw_view.hpp
+++ b/include/mbgl/platform/default/glfw_view.hpp
@@ -14,7 +14,7 @@
class GLFWView : public mbgl::View {
public:
GLFWView(bool fullscreen = false, bool benchmark = false);
- ~GLFWView();
+ ~GLFWView() override;
float getPixelRatio() const override;
std::array<uint16_t, 2> getSize() const override;
diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp
index d787eb1691..b2d0a6e5ac 100644
--- a/include/mbgl/platform/default/headless_view.hpp
+++ b/include/mbgl/platform/default/headless_view.hpp
@@ -31,7 +31,7 @@ class HeadlessView : public View {
public:
HeadlessView(float pixelRatio, uint16_t width = 256, uint16_t height = 256);
HeadlessView(std::shared_ptr<HeadlessDisplay> display, float pixelRatio, uint16_t width = 256, uint16_t height = 256);
- ~HeadlessView();
+ ~HeadlessView() override;
float getPixelRatio() const override;
std::array<uint16_t, 2> getSize() const override;
diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp
index e0adfd8a54..b7d658694c 100644
--- a/platform/default/online_file_source.cpp
+++ b/platform/default/online_file_source.cpp
@@ -27,7 +27,7 @@ public:
using Callback = std::function<void (Response)>;
OnlineFileRequest(Resource, Callback, OnlineFileSource::Impl&);
- ~OnlineFileRequest();
+ ~OnlineFileRequest() override;
void networkIsReachableAgain();
void schedule(optional<Timestamp> expires);
diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp
index bfe83ff557..290df3537e 100644
--- a/src/mbgl/annotation/annotation_tile.hpp
+++ b/src/mbgl/annotation/annotation_tile.hpp
@@ -16,7 +16,7 @@ public:
AnnotationTile(const OverscaledTileID&,
std::string sourceID,
const style::UpdateParameters&);
- ~AnnotationTile();
+ ~AnnotationTile() override;
void setNecessity(Necessity) final;
diff --git a/src/mbgl/style/observer.hpp b/src/mbgl/style/observer.hpp
index 4a5b5ab6ca..2c48114669 100644
--- a/src/mbgl/style/observer.hpp
+++ b/src/mbgl/style/observer.hpp
@@ -17,7 +17,7 @@ public:
* strictly additive; e.g. when a source is loaded, both `onSourceLoaded`
* and `onNeedsRepaint` will be called.
*/
- virtual void onNeedsRepaint() {}
+ void onNeedsRepaint() override {}
virtual void onResourceError(std::exception_ptr) {}
};
diff --git a/src/mbgl/style/source.hpp b/src/mbgl/style/source.hpp
index c17806631b..91fc6514c8 100644
--- a/src/mbgl/style/source.hpp
+++ b/src/mbgl/style/source.hpp
@@ -46,7 +46,7 @@ public:
uint16_t tileSize,
std::unique_ptr<Tileset>&&,
std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&&);
- ~Source();
+ ~Source() override;
bool loaded = false;
void load(FileSource&);
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 522f120d3e..6059c87555 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -37,7 +37,7 @@ class Style : public GlyphStoreObserver,
public util::noncopyable {
public:
Style(FileSource&, float pixelRatio);
- ~Style();
+ ~Style() override;
void setJSON(const std::string&);
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index d80b036a76..71b7db3cf4 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -26,7 +26,7 @@ public:
style::Style&,
const MapMode);
- ~GeometryTile();
+ ~GeometryTile() override;
void setError(std::exception_ptr err);
void setData(std::unique_ptr<GeometryTileData>);
diff --git a/test/src/mbgl/test/fixture_log_observer.hpp b/test/src/mbgl/test/fixture_log_observer.hpp
index c66cd42f18..918bbee18c 100644
--- a/test/src/mbgl/test/fixture_log_observer.hpp
+++ b/test/src/mbgl/test/fixture_log_observer.hpp
@@ -30,10 +30,10 @@ public:
using LogMessage = Message;
Observer(FixtureLog* log = nullptr);
- ~Observer();
+ ~Observer() override;
// Log::Observer implementation
- virtual bool onRecord(EventSeverity severity,
+ bool onRecord(EventSeverity severity,
Event event,
int64_t code,
const std::string& msg) override;
diff --git a/test/src/mbgl/test/stub_file_source.cpp b/test/src/mbgl/test/stub_file_source.cpp
index 89ccb3b335..7b92fd253f 100644
--- a/test/src/mbgl/test/stub_file_source.cpp
+++ b/test/src/mbgl/test/stub_file_source.cpp
@@ -10,7 +10,7 @@ public:
: fileSource(fileSource_) {
}
- ~StubFileRequest() {
+ ~StubFileRequest() override {
fileSource.pending.erase(this);
}