diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-11 12:06:41 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-20 13:01:59 +0300 |
| commit | 2f8fce7bdb0a60a1fb94a3f5bb9f35adf8795094 (patch) | |
| tree | 352d873fb40ee447a098e70cbdf77c4976e7e3e6 /src | |
| parent | 05ae0b5dfd6ea81f357360dc893aa1a78e02926a (diff) | |
| download | qtlocation-mapboxgl-2f8fce7bdb0a60a1fb94a3f5bb9f35adf8795094.tar.gz | |
[core] Cleaned up TransitionOptions
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/style/cascade_parameters.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/style/property_parsing.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/style/style.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/style/cascade_parameters.hpp b/src/mbgl/style/cascade_parameters.hpp index 4ad6da2ce3..e0333741dd 100644 --- a/src/mbgl/style/cascade_parameters.hpp +++ b/src/mbgl/style/cascade_parameters.hpp @@ -9,8 +9,6 @@ namespace mbgl { namespace style { -class TransitionOptions; - class CascadeParameters { public: std::vector<ClassID> classes; diff --git a/src/mbgl/style/property_parsing.cpp b/src/mbgl/style/property_parsing.cpp index 2eb55dcb25..263516f201 100644 --- a/src/mbgl/style/property_parsing.cpp +++ b/src/mbgl/style/property_parsing.cpp @@ -150,7 +150,7 @@ optional<TransitionOptions> parseTransitionOptions(const char *, const JSValue& return {}; } - return TransitionOptions(duration, delay); + return TransitionOptions { duration, delay }; } } // namespace style diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index eade8c51c9..cfeff6d400 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -180,7 +180,7 @@ void Style::update(const UpdateParameters& parameters) { void Style::cascade(const TimePoint& timePoint, MapMode mode) { // When in continuous mode, we can either have user- or style-defined // transitions. Still mode is always immediate. - static const TransitionOptions immediateTransition; + static const TransitionOptions immediateTransition {}; std::vector<ClassID> classIDs; for (const auto& className : classes) { |