diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/map_options.cpp | 16 | ||||
-rw-r--r-- | src/mbgl/storage/resource_options.cpp | 24 |
2 files changed, 20 insertions, 20 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 { diff --git a/src/mbgl/storage/resource_options.cpp b/src/mbgl/storage/resource_options.cpp index dcd7f84f7e..600b535228 100644 --- a/src/mbgl/storage/resource_options.cpp +++ b/src/mbgl/storage/resource_options.cpp @@ -19,54 +19,54 @@ ResourceOptions::~ResourceOptions() = default; ResourceOptions::ResourceOptions(ResourceOptions&&) = default; ResourceOptions::ResourceOptions(const ResourceOptions& other) : impl_(std::make_unique<Impl>(*other.impl_)) {} -ResourceOptions ResourceOptions::withAccessToken(std::string token) { +ResourceOptions& ResourceOptions::withAccessToken(std::string token) { impl_->accessToken = std::move(token); - return std::move(*this); + return *this; } const std::string& ResourceOptions::accessToken() const { return impl_->accessToken; } -ResourceOptions ResourceOptions::withBaseURL(std::string url) { +ResourceOptions& ResourceOptions::withBaseURL(std::string url) { impl_->baseURL = std::move(url); - return std::move(*this); + return *this; } const std::string& ResourceOptions::baseURL() const { return impl_->baseURL; } -ResourceOptions ResourceOptions::withCachePath(std::string path) { +ResourceOptions& ResourceOptions::withCachePath(std::string path) { impl_->cachePath = std::move(path); - return std::move(*this); + return *this; } const std::string& ResourceOptions::cachePath() const { return impl_->cachePath; } -ResourceOptions ResourceOptions::withAssetPath(std::string path) { +ResourceOptions& ResourceOptions::withAssetPath(std::string path) { impl_->assetPath = std::move(path); - return std::move(*this); + return *this; } const std::string& ResourceOptions::assetPath() const { return impl_->assetPath; } -ResourceOptions ResourceOptions::withMaximumCacheSize(uint64_t size) { +ResourceOptions& ResourceOptions::withMaximumCacheSize(uint64_t size) { impl_->maximumSize = size; - return std::move(*this); + return *this; } uint64_t ResourceOptions::maximumCacheSize() const { return impl_->maximumSize; } -ResourceOptions ResourceOptions::withPlatformContext(void* context) { +ResourceOptions& ResourceOptions::withPlatformContext(void* context) { impl_->platformContext = context; - return std::move(*this); + return *this; } void* ResourceOptions::platformContext() const { |