diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-06-25 14:13:05 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-06-26 10:32:07 -0700 |
commit | e6a576f6eb2fb0124b7cbfbc975398ded5e812f9 (patch) | |
tree | 9236db608b67984885598f7ba11151d2301ac0b3 /src | |
parent | 07a6d2ef647e44151c269de2abdc98c89b0ae910 (diff) | |
download | qtlocation-mapboxgl-e6a576f6eb2fb0124b7cbfbc975398ded5e812f9.tar.gz |
currentState() ⇢ getState()
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/map.cpp | 18 | ||||
-rw-r--r-- | src/mbgl/map/transform.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/map/transform.hpp | 2 |
3 files changed, 10 insertions, 16 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index cc40ff2ba9..41bd57cd23 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -42,11 +42,11 @@ void Map::resume() { } void Map::renderStill(StillImageCallback callback) { - context->invoke(&MapContext::renderStill, transform->currentState(), callback); + context->invoke(&MapContext::renderStill, transform->getState(), callback); } void Map::renderSync() { - bool rerender = context->invokeSync<bool>(&MapContext::renderSync, transform->currentState()); + bool rerender = context->invokeSync<bool>(&MapContext::renderSync, transform->getState()); if (transform->needsTransition()) { update(Update(transform->updateTransitions(Clock::now()))); @@ -56,7 +56,7 @@ void Map::renderSync() { } void Map::update(Update update_) { - context->invoke(&MapContext::triggerUpdate, transform->currentState(), update_); + context->invoke(&MapContext::triggerUpdate, transform->getState(), update_); } #pragma mark - Style @@ -196,22 +196,22 @@ void Map::resetZoom() { } double Map::getMinZoom() const { - return transform->currentState().getMinZoom(); + return transform->getState().getMinZoom(); } double Map::getMaxZoom() const { - return transform->currentState().getMaxZoom(); + return transform->getState().getMaxZoom(); } #pragma mark - Size uint16_t Map::getWidth() const { - return transform->currentState().getWidth(); + return transform->getState().getWidth(); } uint16_t Map::getHeight() const { - return transform->currentState().getHeight(); + return transform->getState().getHeight(); } @@ -265,11 +265,11 @@ const LatLng Map::latLngForProjectedMeters(const ProjectedMeters projectedMeters } const vec2<double> Map::pixelForLatLng(const LatLng latLng) const { - return transform->currentState().pixelForLatLng(latLng); + return transform->getState().pixelForLatLng(latLng); } const LatLng Map::latLngForPixel(const vec2<double> pixel) const { - return transform->currentState().latLngForPixel(pixel); + return transform->getState().latLngForPixel(pixel); } #pragma mark - Annotations diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index 475589c2ae..ed442260bb 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -404,9 +404,3 @@ void Transform::cancelTransitions() { void Transform::setGestureInProgress(bool inProgress) { state.gestureInProgress = inProgress; } - -#pragma mark - Transform state - -const TransformState Transform::currentState() const { - return state; -} diff --git a/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp index 678f3ffc11..96e5198dba 100644 --- a/src/mbgl/map/transform.hpp +++ b/src/mbgl/map/transform.hpp @@ -52,7 +52,7 @@ public: void setGestureInProgress(bool); // Transform state - const TransformState currentState() const; + const TransformState getState() const { return state; } private: void _moveBy(double dx, double dy, Duration = Duration::zero()); |