diff options
Diffstat (limited to 'src/mbgl/style/sources')
-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 |
3 files changed, 5 insertions, 11 deletions
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), |