summaryrefslogtreecommitdiff
path: root/src
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
commitb49517b73705e69d401925658ae0657b8a98b6a6 (patch)
tree617a0f7493b0071be01e272efc819f15154190e7 /src
parent542c11ae63f4afff2e0c84712019c0f9f19ef590 (diff)
downloadqtlocation-mapboxgl-b49517b73705e69d401925658ae0657b8a98b6a6.tar.gz
[core] Fix performance-unnecessary-value-param errors in header files
As reported by clang-tidy-8.
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/map/map_impl.cpp2
-rw-r--r--src/mbgl/map/map_impl.hpp2
-rw-r--r--src/mbgl/renderer/image_manager_observer.hpp2
-rw-r--r--src/mbgl/renderer/render_orchestrator.cpp4
-rw-r--r--src/mbgl/renderer/render_orchestrator.hpp2
-rw-r--r--src/mbgl/sprite/sprite_loader_observer.hpp3
6 files changed, 9 insertions, 6 deletions
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<void()> done) {
+void Map::Impl::onStyleImageMissing(const std::string& id, const std::function<void()>& 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<void()>) final;
+ void onStyleImageMissing(const std::string&, const std::function<void()>&) final;
void onRemoveUnusedStyleImages(const std::vector<std::string>&) 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<void()> done) { done(); }
+ virtual void onStyleImageMissing(const std::string&, const std::function<void()>& done) { done(); }
virtual void onRemoveUnusedStyleImages(const std::vector<std::string>&) {}
};
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<void()> done) {
- observer->onStyleImageMissing(id, std::move(done));
+void RenderOrchestrator::onStyleImageMissing(const std::string& id, const std::function<void()>& done) {
+ observer->onStyleImageMissing(id, done);
}
void RenderOrchestrator::onRemoveUnusedStyleImages(const std::vector<std::string>& 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<void()>) override;
+ void onStyleImageMissing(const std::string&, const std::function<void()>&) override;
void onRemoveUnusedStyleImages(const std::vector<std::string>&) 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<Immutable<style::Image::Impl>>) {}
+
virtual void onSpriteError(std::exception_ptr) {}
};