diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-05-15 15:05:44 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-05-15 15:35:43 +0300 |
commit | 60eb3f5723b96618db00a22458f6d7d23dcd4daf (patch) | |
tree | 319a53bb92010768c5c1f4e38fe3bf0b6b518fae | |
parent | c69e8fc0a6ee61f3b9ced7eef9212103b5962119 (diff) | |
download | qtlocation-mapboxgl-60eb3f5723b96618db00a22458f6d7d23dcd4daf.tar.gz |
[tidy] Fix previously silenced lints
-rw-r--r-- | include/mbgl/map/camera.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/transform.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/render_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/renderer/render_source.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/sources/raster_source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/sources/vector_source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/style.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/util/clip_id.hpp | 2 | ||||
-rw-r--r-- | test/src/mbgl/test/getrss.hpp | 2 |
9 files changed, 11 insertions, 9 deletions
diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp index 53b5b590b1..5932487d5f 100644 --- a/include/mbgl/map/camera.hpp +++ b/include/mbgl/map/camera.hpp @@ -80,7 +80,7 @@ struct AnimationOptions { std::function<void()> transitionFinishFn; /** Creates an animation with no options specified. */ - AnimationOptions() {} + AnimationOptions() = default; /** Creates an animation with the specified duration. */ AnimationOptions(Duration d) diff --git a/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp index af2f821602..732b67ca6b 100644 --- a/src/mbgl/map/transform.hpp +++ b/src/mbgl/map/transform.hpp @@ -21,7 +21,7 @@ public: ConstrainMode = ConstrainMode::HeightOnly, ViewportMode = ViewportMode::Default); - Transform(const TransformState &state_) : observer(MapObserver::nullObserver()), state(state_) {} + Transform(TransformState state_) : observer(MapObserver::nullObserver()), state(std::move(state_)) {} // Map view void resize(Size size); diff --git a/src/mbgl/renderer/render_layer.cpp b/src/mbgl/renderer/render_layer.cpp index cf7f772e16..ffa661b2a2 100644 --- a/src/mbgl/renderer/render_layer.cpp +++ b/src/mbgl/renderer/render_layer.cpp @@ -8,6 +8,7 @@ #include <mbgl/renderer/layers/render_raster_layer.hpp> #include <mbgl/renderer/layers/render_symbol_layer.hpp> #include <mbgl/style/types.hpp> +#include <utility> namespace mbgl { @@ -40,7 +41,7 @@ std::unique_ptr<RenderLayer> RenderLayer::create(Immutable<Layer::Impl> impl) { RenderLayer::RenderLayer(style::LayerType type_, Immutable<style::Layer::Impl> baseImpl_) : type(type_), - baseImpl(baseImpl_) { + baseImpl(std::move(baseImpl_)) { } void RenderLayer::setImpl(Immutable<style::Layer::Impl> impl) { diff --git a/src/mbgl/renderer/render_source.cpp b/src/mbgl/renderer/render_source.cpp index 4b411aa703..16527a2b8a 100644 --- a/src/mbgl/renderer/render_source.cpp +++ b/src/mbgl/renderer/render_source.cpp @@ -5,6 +5,7 @@ #include <mbgl/renderer/sources/render_vector_source.hpp> #include <mbgl/annotation/render_annotation_source.hpp> #include <mbgl/tile/tile.hpp> +#include <utility> namespace mbgl { @@ -33,7 +34,7 @@ std::unique_ptr<RenderSource> RenderSource::create(Immutable<Source::Impl> impl) static RenderSourceObserver nullObserver; RenderSource::RenderSource(Immutable<style::Source::Impl> impl) - : baseImpl(impl), + : baseImpl(std::move(impl)), observer(&nullObserver) { } diff --git a/src/mbgl/style/sources/raster_source.cpp b/src/mbgl/style/sources/raster_source.cpp index 0a0412a4ed..c3339ea57f 100644 --- a/src/mbgl/style/sources/raster_source.cpp +++ b/src/mbgl/style/sources/raster_source.cpp @@ -47,7 +47,7 @@ void RasterSource::loadDescription(FileSource& fileSource) { return; } - const std::string& url = urlOrTileset.get<std::string>(); + const auto& url = urlOrTileset.get<std::string>(); req = fileSource.request(Resource::source(url), [this, url](Response res) { if (res.error) { observer->onSourceError(*this, std::make_exception_ptr(std::runtime_error(res.error->message))); diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp index ccdd453c75..691f23b411 100644 --- a/src/mbgl/style/sources/vector_source.cpp +++ b/src/mbgl/style/sources/vector_source.cpp @@ -44,7 +44,7 @@ void VectorSource::loadDescription(FileSource& fileSource) { return; } - const std::string& url = urlOrTileset.get<std::string>(); + const auto& url = urlOrTileset.get<std::string>(); req = fileSource.request(Resource::source(url), [this, url](Response res) { if (res.error) { observer->onSourceError(*this, std::make_exception_ptr(std::runtime_error(res.error->message))); diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index ae9ed97427..279a376b82 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -577,7 +577,7 @@ RenderData Style::getRenderData(MapDebugOptions debugOptions, float angle) const continue; } - if (const RenderBackgroundLayer* background = layer->as<RenderBackgroundLayer>()) { + if (const auto* background = layer->as<RenderBackgroundLayer>()) { if (debugOptions & MapDebugOptions::Overdraw) { // We want to skip glClear optimization in overdraw mode. result.order.emplace_back(*layer); diff --git a/src/mbgl/util/clip_id.hpp b/src/mbgl/util/clip_id.hpp index de2dc51919..33ca2436c5 100644 --- a/src/mbgl/util/clip_id.hpp +++ b/src/mbgl/util/clip_id.hpp @@ -12,7 +12,7 @@ namespace mbgl { struct ClipID { - ClipID() {} + ClipID() = default; ClipID(const std::string &mask_, const std::string &reference_) : mask(mask_), reference(reference_) {} std::bitset<8> mask; diff --git a/test/src/mbgl/test/getrss.hpp b/test/src/mbgl/test/getrss.hpp index be45ae889a..27b538b024 100644 --- a/test/src/mbgl/test/getrss.hpp +++ b/test/src/mbgl/test/getrss.hpp @@ -16,7 +16,7 @@ #include <procfs.h> #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__gnu_linux__) -#include <stdio.h> +#include <cstdio> #endif |