From 2f8fce7bdb0a60a1fb94a3f5bb9f35adf8795094 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Sat, 11 Jun 2016 12:06:41 +0300
Subject: [PATCH] [core] Cleaned up TransitionOptions

---
 include/mbgl/style/transition_options.hpp | 10 +++-------
 src/mbgl/style/cascade_parameters.hpp     |  2 --
 src/mbgl/style/property_parsing.cpp       |  2 +-
 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 5803fe05c..d7a6633f0 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 4ad6da2ce..e0333741d 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 2eb55dcb2..263516f20 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 eade8c51c..cfeff6d40 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) {