From 9bdd765a02de75851a00ab85223d5d582a104757 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 31 Jul 2018 14:21:47 -0700
Subject: [core] Merge DataDrivenPropertyValue into PropertyValue (#12513)

---
 include/mbgl/style/layers/fill_layer.hpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'include/mbgl/style/layers/fill_layer.hpp')

diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index dfbe69d7fe..d0b2a25bfe 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -5,7 +5,6 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
-#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <mbgl/util/color.hpp>
 
@@ -42,21 +41,21 @@ public:
     void setFillAntialiasTransition(const TransitionOptions&);
     TransitionOptions getFillAntialiasTransition() const;
 
-    static DataDrivenPropertyValue<float> getDefaultFillOpacity();
-    DataDrivenPropertyValue<float> getFillOpacity() const;
-    void setFillOpacity(DataDrivenPropertyValue<float>);
+    static PropertyValue<float> getDefaultFillOpacity();
+    PropertyValue<float> getFillOpacity() const;
+    void setFillOpacity(PropertyValue<float>);
     void setFillOpacityTransition(const TransitionOptions&);
     TransitionOptions getFillOpacityTransition() const;
 
-    static DataDrivenPropertyValue<Color> getDefaultFillColor();
-    DataDrivenPropertyValue<Color> getFillColor() const;
-    void setFillColor(DataDrivenPropertyValue<Color>);
+    static PropertyValue<Color> getDefaultFillColor();
+    PropertyValue<Color> getFillColor() const;
+    void setFillColor(PropertyValue<Color>);
     void setFillColorTransition(const TransitionOptions&);
     TransitionOptions getFillColorTransition() const;
 
-    static DataDrivenPropertyValue<Color> getDefaultFillOutlineColor();
-    DataDrivenPropertyValue<Color> getFillOutlineColor() const;
-    void setFillOutlineColor(DataDrivenPropertyValue<Color>);
+    static PropertyValue<Color> getDefaultFillOutlineColor();
+    PropertyValue<Color> getFillOutlineColor() const;
+    void setFillOutlineColor(PropertyValue<Color>);
     void setFillOutlineColorTransition(const TransitionOptions&);
     TransitionOptions getFillOutlineColorTransition() const;
 
-- 
cgit v1.2.1