summaryrefslogtreecommitdiff
path: root/include/mbgl/map
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2019-03-21 18:36:43 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2019-03-22 18:54:48 +0200
commit03db58cdc1f1f31034863020f205f5c5696bfa8b (patch)
treee4201a14948d3772fbd4f8bcff6f7d38e2dfd27d /include/mbgl/map
parent2de2b0b068520a55170d23c86f349232b3e28ae7 (diff)
downloadqtlocation-mapboxgl-03db58cdc1f1f31034863020f205f5c5696bfa8b.tar.gz
[core] Replace shared_ptr with unique_ptr in {Map,Resource}Options
Diffstat (limited to 'include/mbgl/map')
-rw-r--r--include/mbgl/map/map_options.hpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/include/mbgl/map/map_options.hpp b/include/mbgl/map/map_options.hpp
index f2297484a3..384b113dba 100644
--- a/include/mbgl/map/map_options.hpp
+++ b/include/mbgl/map/map_options.hpp
@@ -17,15 +17,18 @@ public:
MapOptions();
~MapOptions();
+ MapOptions(MapOptions&&);
+ explicit MapOptions(const MapOptions&);
+
/**
* @brief Sets the map rendering mode. By default, it is set to Continuous
* so the map will render as data arrives from the network and react
* immediately to state changes.
*
* @param mode Map rendering mode.
- * @return reference to MapOptions for chaining options together.
+ * @return MapOptions for chaining options together.
*/
- MapOptions& withMapMode(MapMode mode);
+ MapOptions withMapMode(MapMode mode);
/**
* @brief Gets the previously set (or default) map mode.
@@ -40,9 +43,9 @@ public:
* HeightOnly.
*
* @param mode Map constrain mode.
- * @return reference to MapOptions for chaining options together.
+ * @return MapOptions for chaining options together.
*/
- MapOptions& withConstrainMode(ConstrainMode mode);
+ MapOptions withConstrainMode(ConstrainMode mode);
/**
* @brief Gets the previously set (or default) constrain mode.
@@ -56,9 +59,9 @@ public:
* orientation of the map as some devices may use inverted orientation.
*
* @param mode Viewport mode.
- * @return reference to MapOptions for chaining options together.
+ * @return MapOptions for chaining options together.
*/
- MapOptions& withViewportMode(ViewportMode mode);
+ MapOptions withViewportMode(ViewportMode mode);
/**
* @brief Gets the previously set (or default) viewport mode.
@@ -72,9 +75,9 @@ public:
* or not. By default, it is set to true.
*
* @param enableCollisions true to enable, false to disable
- * @return reference to MapOptions for chaining options together.
+ * @return MapOptions for chaining options together.
*/
- MapOptions& withCrossSourceCollisions(bool enableCollisions);
+ MapOptions withCrossSourceCollisions(bool enableCollisions);
/**
* @brief Gets the previously set (or default) crossSourceCollisions value.
@@ -86,7 +89,7 @@ public:
private:
class Impl;
- std::shared_ptr<Impl> impl_;
+ std::unique_ptr<Impl> impl_;
};
} // namespace mbgl