summaryrefslogtreecommitdiff
path: root/src/mbgl/map/map_options.cpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2019-03-22 21:15:00 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2019-03-22 22:02:28 +0200
commit7f734ea31b8b89ce7072ff3aaa305808ed346d1d (patch)
treeeebe292ac36bb09f3ec6d04d54bf45f07945cb40 /src/mbgl/map/map_options.cpp
parentdcd6efd5b5c806c524095500ae1d832765816f47 (diff)
downloadqtlocation-mapboxgl-upstream/revert-14189-options-unique_ptr.tar.gz
[core] Fix signature of fluent interface settersupstream/revert-14189-options-unique_ptr
Diffstat (limited to 'src/mbgl/map/map_options.cpp')
-rw-r--r--src/mbgl/map/map_options.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mbgl/map/map_options.cpp b/src/mbgl/map/map_options.cpp
index c1146ab0bc..d0588a44eb 100644
--- a/src/mbgl/map/map_options.cpp
+++ b/src/mbgl/map/map_options.cpp
@@ -16,36 +16,36 @@ MapOptions::~MapOptions() = default;
MapOptions::MapOptions(MapOptions&&) = default;
MapOptions::MapOptions(const MapOptions& other) : impl_(std::make_unique<Impl>(*other.impl_)) {}
-MapOptions MapOptions::withMapMode(MapMode mode) {
+MapOptions& MapOptions::withMapMode(MapMode mode) {
impl_->mapMode = mode;
- return std::move(*this);
+ return *this;
}
MapMode MapOptions::mapMode() const {
return impl_->mapMode;
}
-MapOptions MapOptions::withConstrainMode(ConstrainMode mode) {
+MapOptions& MapOptions::withConstrainMode(ConstrainMode mode) {
impl_->constrainMode = mode;
- return std::move(*this);
+ return *this;
}
ConstrainMode MapOptions::constrainMode() const {
return impl_->constrainMode;
}
-MapOptions MapOptions::withViewportMode(ViewportMode mode) {
+MapOptions& MapOptions::withViewportMode(ViewportMode mode) {
impl_->viewportMode = mode;
- return std::move(*this);
+ return *this;
}
ViewportMode MapOptions::viewportMode() const {
return impl_->viewportMode;
}
-MapOptions MapOptions::withCrossSourceCollisions(bool enableCollisions) {
+MapOptions& MapOptions::withCrossSourceCollisions(bool enableCollisions) {
impl_->crossSourceCollisions = enableCollisions;
- return std::move(*this);
+ return *this;
}
bool MapOptions::crossSourceCollisions() const {