[core] Merge DataDrivenPropertyValue into PropertyValue (#12513)

1 files changed, 6 insertions, 7 deletions

diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp
index 4c434b2aff..53fd24aa6c 100644
--- a/include/mbgl/style/layers/heatmap_layer.hpp
+++ b/include/mbgl/style/layers/heatmap_layer.hpp
@@ -6,7 +6,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>
 
@@ -37,15 +36,15 @@ public:
 
     // Paint properties
 
-    static DataDrivenPropertyValue<float> getDefaultHeatmapRadius();
-    DataDrivenPropertyValue<float> getHeatmapRadius() const;
-    void setHeatmapRadius(DataDrivenPropertyValue<float>);
+    static PropertyValue<float> getDefaultHeatmapRadius();
+    PropertyValue<float> getHeatmapRadius() const;
+    void setHeatmapRadius(PropertyValue<float>);
     void setHeatmapRadiusTransition(const TransitionOptions&);
     TransitionOptions getHeatmapRadiusTransition() const;
 
-    static DataDrivenPropertyValue<float> getDefaultHeatmapWeight();
-    DataDrivenPropertyValue<float> getHeatmapWeight() const;
-    void setHeatmapWeight(DataDrivenPropertyValue<float>);
+    static PropertyValue<float> getDefaultHeatmapWeight();
+    PropertyValue<float> getHeatmapWeight() const;
+    void setHeatmapWeight(PropertyValue<float>);
     void setHeatmapWeightTransition(const TransitionOptions&);
     TransitionOptions getHeatmapWeightTransition() const;