summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/map/map.hpp24
-rw-r--r--include/mbgl/util/uv.hpp2
2 files changed, 12 insertions, 14 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 294d0efcd6..82aef65b65 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -82,8 +82,8 @@ public:
void setClasses(const std::vector<std::string>&);
std::vector<std::string> getClasses() const;
- void setDefaultTransitionDuration(Duration = Duration::zero());
- Duration getDefaultTransitionDuration();
+ void setDefaultTransitionDuration(const Duration& = Duration::zero());
+ Duration getDefaultTransitionDuration() const;
void setStyleURL(const std::string& url);
void setStyleJSON(const std::string& json, const std::string& base = "");
std::string getStyleURL() const;
@@ -94,27 +94,27 @@ public:
void setGestureInProgress(bool);
// Position
- void moveBy(double dx, double dy, Duration = Duration::zero());
- void setLatLng(LatLng latLng, Duration = Duration::zero());
+ void moveBy(double dx, double dy, const Duration& = Duration::zero());
+ void setLatLng(LatLng latLng, const Duration& = Duration::zero());
LatLng getLatLng() const;
void resetPosition();
// Scale
- void scaleBy(double ds, double cx = -1, double cy = -1, Duration = Duration::zero());
- void setScale(double scale, double cx = -1, double cy = -1, Duration = Duration::zero());
+ void scaleBy(double ds, double cx = -1, double cy = -1, const Duration& = Duration::zero());
+ void setScale(double scale, double cx = -1, double cy = -1, const Duration& = Duration::zero());
double getScale() const;
- void setZoom(double zoom, Duration = Duration::zero());
+ void setZoom(double zoom, const Duration& = Duration::zero());
double getZoom() const;
- void setLatLngZoom(LatLng latLng, double zoom, Duration = Duration::zero());
- void fitBounds(LatLngBounds bounds, EdgeInsets padding, Duration duration = Duration::zero());
- void fitBounds(AnnotationSegment segment, EdgeInsets padding, Duration duration = Duration::zero());
+ void setLatLngZoom(LatLng latLng, double zoom, const Duration& = Duration::zero());
+ void fitBounds(LatLngBounds bounds, EdgeInsets padding, const Duration& duration = Duration::zero());
+ void fitBounds(AnnotationSegment segment, EdgeInsets padding, const Duration& duration = Duration::zero());
void resetZoom();
double getMinZoom() const;
double getMaxZoom() const;
// Rotation
- void rotateBy(double sx, double sy, double ex, double ey, Duration = Duration::zero());
- void setBearing(double degrees, Duration = Duration::zero());
+ void rotateBy(double sx, double sy, double ex, double ey, const Duration& = Duration::zero());
+ void setBearing(double degrees, const Duration& = Duration::zero());
void setBearing(double degrees, double cx, double cy);
double getBearing() const;
void resetNorth();
diff --git a/include/mbgl/util/uv.hpp b/include/mbgl/util/uv.hpp
index 19c6c5b4df..9198b0fd1c 100644
--- a/include/mbgl/util/uv.hpp
+++ b/include/mbgl/util/uv.hpp
@@ -12,8 +12,6 @@ typedef struct uv_fs_s uv_fs_t;
namespace uv {
-std::string cwd();
-
class rwlock;
class loop;
class async;