diff options
| -rw-r--r-- | include/mbgl/style/transition_options.hpp | 10 | ||||
| -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 |
4 files changed, 5 insertions, 11 deletions
diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp index 5803fe05c9..d7a6633f0c 100644 --- a/include/mbgl/style/transition_options.hpp +++ b/include/mbgl/style/transition_options.hpp @@ -6,13 +6,9 @@ namespace mbgl { namespace style { -class TransitionOptions { -public: - TransitionOptions(optional<Duration> duration_ = {}, optional<Duration> delay_ = {}) - : duration(std::move(duration_)), delay(std::move(delay_)) {} - - optional<Duration> duration; - optional<Duration> delay; +struct TransitionOptions { + optional<Duration> duration = {}; + optional<Duration> delay = {}; }; } // namespace style 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) { |