diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-06 16:15:27 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-18 01:26:22 +0200 |
| commit | 8f96dea8220074059438e9d732d9ce89bddd7fd9 (patch) | |
| tree | de2f72ef5189fb3fa6225260cddfbbd92b90a121 /include | |
| parent | 15621b066c494a43502ccf3b0b7a0bea4920ac46 (diff) | |
| download | qtlocation-mapboxgl-8f96dea8220074059438e9d732d9ce89bddd7fd9.tar.gz | |
[core] Remove default transition duration
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/map.hpp | 3 | ||||
| -rw-r--r-- | include/mbgl/map/update.hpp | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 6edc7f6d2c..3de9dc8891 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -75,9 +75,6 @@ public: void setDefaultFadeDuration(const Duration&); Duration getDefaultFadeDuration() const; - void setDefaultTransitionDuration(const Duration&); - Duration getDefaultTransitionDuration() const; - void setStyleURL(const std::string& url); void setStyleJSON(const std::string& json, const std::string& base = ""); std::string getStyleURL() const; diff --git a/include/mbgl/map/update.hpp b/include/mbgl/map/update.hpp index dbabff5bff..e47feea949 100644 --- a/include/mbgl/map/update.hpp +++ b/include/mbgl/map/update.hpp @@ -5,19 +5,18 @@ namespace mbgl { -enum class Update : uint32_t { +enum class Update : uint8_t { Nothing = 0, Dimensions = 1 << 1, - DefaultTransition = 1 << 2, - Classes = 1 << 3, - RecalculateStyle = 1 << 4, - RenderStill = 1 << 5, - Repaint = 1 << 6, - Annotations = 1 << 7, + Classes = 1 << 2, + RecalculateStyle = 1 << 3, + RenderStill = 1 << 4, + Repaint = 1 << 5, + Annotations = 1 << 6, }; inline Update operator| (const Update& lhs, const Update& rhs) { - return Update(static_cast<uint32_t>(lhs) | static_cast<uint32_t>(rhs)); + return Update(static_cast<uint8_t>(lhs) | static_cast<uint8_t>(rhs)); } inline Update& operator|=(Update& lhs, const Update& rhs) { @@ -26,7 +25,7 @@ inline Update& operator|=(Update& lhs, const Update& rhs) { } inline bool operator& (const Update& lhs, const Update& rhs) { - return static_cast<uint32_t>(lhs) & static_cast<uint32_t>(rhs); + return static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs); } } // namespace mbgl |