From c902f9098b331302aaa1baac77d1575db624a132 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 26 Apr 2016 16:39:56 -0700
Subject: [core] Rationalize naming for style-related code

---
 src/mbgl/style/property_parsing.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/mbgl/style/property_parsing.hpp')

diff --git a/src/mbgl/style/property_parsing.hpp b/src/mbgl/style/property_parsing.hpp
index c0fe5ce2bc..bb894c2407 100644
--- a/src/mbgl/style/property_parsing.hpp
+++ b/src/mbgl/style/property_parsing.hpp
@@ -2,10 +2,11 @@
 
 #include <mbgl/style/types.hpp>
 #include <mbgl/style/property_value.hpp>
-#include <mbgl/style/property_transition.hpp>
+#include <mbgl/style/transition_options.hpp>
 
 #include <mbgl/util/rapidjson.hpp>
 #include <mbgl/util/optional.hpp>
+#include <mbgl/util/color.hpp>
 
 #include <mbgl/platform/log.hpp>
 
@@ -14,6 +15,7 @@
 #include <vector>
 
 namespace mbgl {
+namespace style {
 
 template <typename T>
 optional<T> parseConstant(const char* name, const JSValue&);
@@ -104,6 +106,7 @@ PropertyValue<T> parseProperty(const char* name, const JSValue& value) {
     return Function<T>(stops, base);
 }
 
-optional<PropertyTransition> parsePropertyTransition(const char * name, const JSValue&);
+optional<TransitionOptions> parseTransitionOptions(const char * name, const JSValue&);
 
+} // namespace style
 } // namespace mbgl
-- 
cgit v1.2.1