From b49517b73705e69d401925658ae0657b8a98b6a6 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 27 Mar 2020 18:30:35 +0200 Subject: [core] Fix performance-unnecessary-value-param errors in header files As reported by clang-tidy-8. --- include/mbgl/renderer/renderer_observer.hpp | 2 +- include/mbgl/storage/file_source.hpp | 4 +++- include/mbgl/storage/offline.hpp | 2 +- platform/default/src/mbgl/map/map_snapshotter.cpp | 6 +++--- src/mbgl/map/map_impl.cpp | 2 +- src/mbgl/map/map_impl.hpp | 2 +- src/mbgl/renderer/image_manager_observer.hpp | 2 +- src/mbgl/renderer/render_orchestrator.cpp | 4 ++-- src/mbgl/renderer/render_orchestrator.hpp | 2 +- src/mbgl/sprite/sprite_loader_observer.hpp | 3 +++ test/renderer/image_manager.test.cpp | 2 +- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/include/mbgl/renderer/renderer_observer.hpp b/include/mbgl/renderer/renderer_observer.hpp index e0fc84215e..5d5a7bb5fe 100644 --- a/include/mbgl/renderer/renderer_observer.hpp +++ b/include/mbgl/renderer/renderer_observer.hpp @@ -34,7 +34,7 @@ public: // Style is missing an image using StyleImageMissingCallback = std::function; - virtual void onStyleImageMissing(const std::string&, StyleImageMissingCallback done) { done(); } + virtual void onStyleImageMissing(const std::string&, const StyleImageMissingCallback& done) { done(); } virtual void onRemoveUnusedStyleImages(const std::vector&) {} }; diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp index 0ce88981a5..562fd8da08 100644 --- a/include/mbgl/storage/file_source.hpp +++ b/include/mbgl/storage/file_source.hpp @@ -48,6 +48,8 @@ public: // Allows to forward response from one source to another. // Optionally, callback can be provided to receive notification for forward // operation. + // + // NOLINTNEXTLINE(performance-unnecessary-value-param) virtual void forward(const Resource&, const Response&, std::function) {} // When a file source supports consulting a local cache only, it must return true. @@ -82,7 +84,7 @@ public: virtual mapbox::base::Value getProperty(const std::string&) const { return {}; }; // When supported, sets the modifier of the requested resources. - virtual void setResourceTransform(ResourceTransform) {} + virtual void setResourceTransform(ResourceTransform) {} // NOLINT(performance-unnecessary-value-param) protected: FileSource() = default; diff --git a/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp index f35abbfe38..97e7fc2e49 100644 --- a/include/mbgl/storage/offline.hpp +++ b/include/mbgl/storage/offline.hpp @@ -191,7 +191,7 @@ public: * responsibility of the SDK bindings to wrap this object in an interface that * re-executes the user-provided implementation on the main thread. */ - virtual void responseError(Response::Error) {} + virtual void responseError(Response::Error) {} // NOLINT(performance-unnecessary-value-param) /* * Implement this method to be notified when the limit on the number of Mapbox diff --git a/platform/default/src/mbgl/map/map_snapshotter.cpp b/platform/default/src/mbgl/map/map_snapshotter.cpp index 2b60095d7c..2d73fd4bec 100644 --- a/platform/default/src/mbgl/map/map_snapshotter.cpp +++ b/platform/default/src/mbgl/map/map_snapshotter.cpp @@ -39,8 +39,8 @@ public: delegate.invoke(&RendererObserver::onDidFinishRenderingFrame, mode, repaintNeeded, placementChanged); } - void onStyleImageMissing(const std::string& image, StyleImageMissingCallback cb) override { - delegate.invoke(&RendererObserver::onStyleImageMissing, image, std::move(cb)); + void onStyleImageMissing(const std::string& image, const StyleImageMissingCallback& cb) override { + delegate.invoke(&RendererObserver::onStyleImageMissing, image, cb); } private: @@ -76,7 +76,7 @@ public: rendererObserver->onDidFinishRenderingFrame(mode, repaintNeeded, placementChanged); } - void onStyleImageMissing(const std::string& id, StyleImageMissingCallback done) override { + void onStyleImageMissing(const std::string& id, const StyleImageMissingCallback& done) override { rendererObserver->onStyleImageMissing(id, done); } diff --git a/src/mbgl/map/map_impl.cpp b/src/mbgl/map/map_impl.cpp index 0edc715134..0c93b78f1c 100644 --- a/src/mbgl/map/map_impl.cpp +++ b/src/mbgl/map/map_impl.cpp @@ -167,7 +167,7 @@ void Map::Impl::jumpTo(const CameraOptions& camera) { onUpdate(); } -void Map::Impl::onStyleImageMissing(const std::string& id, std::function done) { +void Map::Impl::onStyleImageMissing(const std::string& id, const std::function& done) { if (!style->getImage(id)) observer.onStyleImageMissing(id); done(); diff --git a/src/mbgl/map/map_impl.hpp b/src/mbgl/map/map_impl.hpp index 022909c8d3..abcfa972f6 100644 --- a/src/mbgl/map/map_impl.hpp +++ b/src/mbgl/map/map_impl.hpp @@ -45,7 +45,7 @@ public: void onDidFinishRenderingFrame(RenderMode, bool, bool) final; void onWillStartRenderingMap() final; void onDidFinishRenderingMap() final; - void onStyleImageMissing(const std::string&, std::function) final; + void onStyleImageMissing(const std::string&, const std::function&) final; void onRemoveUnusedStyleImages(const std::vector&) final; // Map diff --git a/src/mbgl/renderer/image_manager_observer.hpp b/src/mbgl/renderer/image_manager_observer.hpp index c2ca481d66..947c5a36bc 100644 --- a/src/mbgl/renderer/image_manager_observer.hpp +++ b/src/mbgl/renderer/image_manager_observer.hpp @@ -8,7 +8,7 @@ class ImageManagerObserver { public: virtual ~ImageManagerObserver() = default; - virtual void onStyleImageMissing(const std::string&, std::function done) { done(); } + virtual void onStyleImageMissing(const std::string&, const std::function& done) { done(); } virtual void onRemoveUnusedStyleImages(const std::vector&) {} }; diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp index ac62b71828..77e23d3ab6 100644 --- a/src/mbgl/renderer/render_orchestrator.cpp +++ b/src/mbgl/renderer/render_orchestrator.cpp @@ -727,8 +727,8 @@ void RenderOrchestrator::onTileChanged(RenderSource&, const OverscaledTileID&) { observer->onInvalidate(); } -void RenderOrchestrator::onStyleImageMissing(const std::string& id, std::function done) { - observer->onStyleImageMissing(id, std::move(done)); +void RenderOrchestrator::onStyleImageMissing(const std::string& id, const std::function& done) { + observer->onStyleImageMissing(id, done); } void RenderOrchestrator::onRemoveUnusedStyleImages(const std::vector& unusedImageIDs) { diff --git a/src/mbgl/renderer/render_orchestrator.hpp b/src/mbgl/renderer/render_orchestrator.hpp index 08904e7e5a..5d698f5532 100644 --- a/src/mbgl/renderer/render_orchestrator.hpp +++ b/src/mbgl/renderer/render_orchestrator.hpp @@ -100,7 +100,7 @@ private: void onTileError(RenderSource&, const OverscaledTileID&, std::exception_ptr) override; // ImageManagerObserver implementation - void onStyleImageMissing(const std::string&, std::function) override; + void onStyleImageMissing(const std::string&, const std::function&) override; void onRemoveUnusedStyleImages(const std::vector&) override; RendererObserver* observer; diff --git a/src/mbgl/sprite/sprite_loader_observer.hpp b/src/mbgl/sprite/sprite_loader_observer.hpp index 3846d069f0..f72f67cbbb 100644 --- a/src/mbgl/sprite/sprite_loader_observer.hpp +++ b/src/mbgl/sprite/sprite_loader_observer.hpp @@ -15,7 +15,10 @@ class Image; class SpriteLoaderObserver { public: virtual ~SpriteLoaderObserver() = default; + + // NOLINTNEXTLINE(performance-unnecessary-value-param) virtual void onSpriteLoaded(std::vector>) {} + virtual void onSpriteError(std::exception_ptr) {} }; diff --git a/test/renderer/image_manager.test.cpp b/test/renderer/image_manager.test.cpp index c3ab0d8227..395c9fe1e3 100644 --- a/test/renderer/image_manager.test.cpp +++ b/test/renderer/image_manager.test.cpp @@ -140,7 +140,7 @@ class StubImageManagerObserver : public ImageManagerObserver { public: int count = 0; std::function imageMissing = [](const std::string&){}; - void onStyleImageMissing(const std::string& id, std::function done) override { + void onStyleImageMissing(const std::string& id, const std::function& done) override { count++; imageMissing(id); done(); -- cgit v1.2.1