diff options
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/conversion/source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/expression/compound_expression.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/layers/background_layer_properties.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/fill_extrusion_layer_properties.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/fill_layer_properties.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/layer_properties.cpp.ejs | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/line_layer_properties.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/parser.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/sources/geojson_source.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/style/sources/image_source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/sources/image_source_impl.cpp | 9 |
11 files changed, 14 insertions, 20 deletions
diff --git a/src/mbgl/style/conversion/source.cpp b/src/mbgl/style/conversion/source.cpp index de41adc89f..980a1a5772 100644 --- a/src/mbgl/style/conversion/source.cpp +++ b/src/mbgl/style/conversion/source.cpp @@ -128,7 +128,7 @@ static optional<std::unique_ptr<Source>> convertGeoJSONSource(const std::string& if (!geoJSON) { return nullopt; } - result->setGeoJSON(std::move(*geoJSON)); + result->setGeoJSON(*geoJSON); } else if (toString(*dataValue)) { result->setURL(*toString(*dataValue)); } else { diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp index c2bc511e41..f735f57162 100644 --- a/src/mbgl/style/expression/compound_expression.cpp +++ b/src/mbgl/style/expression/compound_expression.cpp @@ -105,7 +105,7 @@ private: for (std::size_t i = 0; i < sizeof...(Params); ++i) { const EvaluationResult evaluatedArg = args.at(i)->evaluate(evaluationParameters); if (!evaluatedArg) return evaluatedArg.error(); - evaluated[i] = std::move(*evaluatedArg); + evaluated[i] = *evaluatedArg; } const R value = evaluate(*fromExpressionValue<std::decay_t<Params>>(evaluated[I])...); if (!value) return value.error(); @@ -165,7 +165,7 @@ private: for (std::size_t i = 0; i < sizeof...(Params); ++i) { const EvaluationResult evaluatedArg = args.at(i)->evaluate(evaluationParameters); if (!evaluatedArg) return evaluatedArg.error(); - evaluated[i] = std::move(*evaluatedArg); + evaluated[i] = *evaluatedArg; } const R value = evaluate(evaluationParameters, *fromExpressionValue<std::decay_t<Params>>(evaluated[I])...); if (!value) return value.error(); diff --git a/src/mbgl/style/layers/background_layer_properties.cpp b/src/mbgl/style/layers/background_layer_properties.cpp index 749affe2e9..9bf405ab01 100644 --- a/src/mbgl/style/layers/background_layer_properties.cpp +++ b/src/mbgl/style/layers/background_layer_properties.cpp @@ -18,7 +18,7 @@ BackgroundLayerProperties::BackgroundLayerProperties( CrossfadeParameters crossfade_, BackgroundPaintProperties::PossiblyEvaluated evaluated_) : LayerProperties(std::move(impl_)), - crossfade(std::move(crossfade_)), + crossfade(crossfade_), evaluated(std::move(evaluated_)) {} BackgroundLayerProperties::~BackgroundLayerProperties() = default; diff --git a/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp b/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp index cd484ac3cc..e1af47070d 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp +++ b/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp @@ -18,7 +18,7 @@ FillExtrusionLayerProperties::FillExtrusionLayerProperties( CrossfadeParameters crossfade_, FillExtrusionPaintProperties::PossiblyEvaluated evaluated_) : LayerProperties(std::move(impl_)), - crossfade(std::move(crossfade_)), + crossfade(crossfade_), evaluated(std::move(evaluated_)) {} FillExtrusionLayerProperties::~FillExtrusionLayerProperties() = default; diff --git a/src/mbgl/style/layers/fill_layer_properties.cpp b/src/mbgl/style/layers/fill_layer_properties.cpp index f8f81c900d..c02ae9cc19 100644 --- a/src/mbgl/style/layers/fill_layer_properties.cpp +++ b/src/mbgl/style/layers/fill_layer_properties.cpp @@ -18,7 +18,7 @@ FillLayerProperties::FillLayerProperties( CrossfadeParameters crossfade_, FillPaintProperties::PossiblyEvaluated evaluated_) : LayerProperties(std::move(impl_)), - crossfade(std::move(crossfade_)), + crossfade(crossfade_), evaluated(std::move(evaluated_)) {} FillLayerProperties::~FillLayerProperties() = default; diff --git a/src/mbgl/style/layers/layer_properties.cpp.ejs b/src/mbgl/style/layers/layer_properties.cpp.ejs index 6574950bec..18b07efea8 100644 --- a/src/mbgl/style/layers/layer_properties.cpp.ejs +++ b/src/mbgl/style/layers/layer_properties.cpp.ejs @@ -26,7 +26,7 @@ namespace style { <%- camelize(type) %>PaintProperties::PossiblyEvaluated evaluated_) : LayerProperties(std::move(impl_)), <% if (type === 'background' || type === 'fill' || type === 'line' || type === 'fill-extrusion') { -%> - crossfade(std::move(crossfade_)), + crossfade(crossfade_), <% } -%> evaluated(std::move(evaluated_)) {} diff --git a/src/mbgl/style/layers/line_layer_properties.cpp b/src/mbgl/style/layers/line_layer_properties.cpp index bae5146846..ca346bfa33 100644 --- a/src/mbgl/style/layers/line_layer_properties.cpp +++ b/src/mbgl/style/layers/line_layer_properties.cpp @@ -18,7 +18,7 @@ LineLayerProperties::LineLayerProperties( CrossfadeParameters crossfade_, LinePaintProperties::PossiblyEvaluated evaluated_) : LayerProperties(std::move(impl_)), - crossfade(std::move(crossfade_)), + crossfade(crossfade_), evaluated(std::move(evaluated_)) {} LineLayerProperties::~LineLayerProperties() = default; diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp index ae298bd915..b90de3e9b9 100644 --- a/src/mbgl/style/parser.cpp +++ b/src/mbgl/style/parser.cpp @@ -138,7 +138,7 @@ void Parser::parseLight(const JSValue& value) { return; } - light = std::move(*converted); + light = *converted; } void Parser::parseSources(const JSValue& value) { diff --git a/src/mbgl/style/sources/geojson_source.cpp b/src/mbgl/style/sources/geojson_source.cpp index baf76d8224..5171c7c8d9 100644 --- a/src/mbgl/style/sources/geojson_source.cpp +++ b/src/mbgl/style/sources/geojson_source.cpp @@ -12,8 +12,7 @@ namespace mbgl { namespace style { GeoJSONSource::GeoJSONSource(const std::string& id, optional<GeoJSONOptions> options) - : Source(makeMutable<Impl>(std::move(id), options)) { -} + : Source(makeMutable<Impl>(id, options)) {} GeoJSONSource::~GeoJSONSource() = default; @@ -22,7 +21,7 @@ const GeoJSONSource::Impl& GeoJSONSource::impl() const { } void GeoJSONSource::setURL(const std::string& url_) { - url = std::move(url_); + url = url_; // Signal that the source description needs a reload if (loaded || req) { diff --git a/src/mbgl/style/sources/image_source.cpp b/src/mbgl/style/sources/image_source.cpp index baadc86e7c..4c18ae5818 100644 --- a/src/mbgl/style/sources/image_source.cpp +++ b/src/mbgl/style/sources/image_source.cpp @@ -30,7 +30,7 @@ std::array<LatLng, 4> ImageSource::getCoordinates() const { } void ImageSource::setURL(const std::string& url_) { - url = std::move(url_); + url = url_; // Signal that the source description needs a reload if (loaded || req) { loaded = false; diff --git a/src/mbgl/style/sources/image_source_impl.cpp b/src/mbgl/style/sources/image_source_impl.cpp index c1f31dbdc6..7a4f5ac01f 100644 --- a/src/mbgl/style/sources/image_source_impl.cpp +++ b/src/mbgl/style/sources/image_source_impl.cpp @@ -5,15 +5,10 @@ namespace mbgl { namespace style { ImageSource::Impl::Impl(std::string id_, std::array<LatLng, 4> coords_) - : Source::Impl(SourceType::Image, std::move(id_)), - coords(std::move(coords_)) { -} + : Source::Impl(SourceType::Image, std::move(id_)), coords(coords_) {} ImageSource::Impl::Impl(const Impl& other, std::array<LatLng, 4> coords_) - : Source::Impl(other), - coords(std::move(coords_)), - image(other.image) { -} + : Source::Impl(other), coords(coords_), image(other.image) {} ImageSource::Impl::Impl(const Impl& rhs, PremultipliedImage&& image_) : Source::Impl(rhs), |