diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-10 12:20:15 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-15 09:45:55 -0700 |
commit | e473f2dcceb31eda816ac9e6c972d7e0a8f1dceb (patch) | |
tree | a80415390c30f4e4efd47da25f6fee776730465d /src/mbgl/style/paint_property.hpp | |
parent | da4d735e2c465195e0fb9531ce9d4d7c5c9e6503 (diff) | |
download | qtlocation-mapboxgl-e473f2dcceb31eda816ac9e6c972d7e0a8f1dceb.tar.gz |
[core] cascade ⇢ transition / cascading ⇢ transitionable
Diffstat (limited to 'src/mbgl/style/paint_property.hpp')
-rw-r--r-- | src/mbgl/style/paint_property.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index b0dc5641fb..80d54abceb 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -15,7 +15,7 @@ namespace style { template <class T> class PaintProperty { public: - using CascadingType = Cascading<PropertyValue<T>>; + using TransitionableType = Cascading<PropertyValue<T>>; using UnevaluatedType = Transitioning<PropertyValue<T>>; using EvaluatorType = PropertyEvaluator<T>; using PossiblyEvaluatedType = T; @@ -26,7 +26,7 @@ public: template <class T, class A> class DataDrivenPaintProperty { public: - using CascadingType = Cascading<DataDrivenPropertyValue<T>>; + using TransitionableType = Cascading<DataDrivenPropertyValue<T>>; using UnevaluatedType = Transitioning<DataDrivenPropertyValue<T>>; using EvaluatorType = DataDrivenPropertyEvaluator<T>; using PossiblyEvaluatedType = PossiblyEvaluatedPropertyValue<T>; @@ -39,7 +39,7 @@ public: template <class T> class CrossFadedPaintProperty { public: - using CascadingType = Cascading<PropertyValue<T>>; + using TransitionableType = Cascading<PropertyValue<T>>; using UnevaluatedType = Transitioning<PropertyValue<T>>; using EvaluatorType = CrossFadedPropertyEvaluator<T>; using PossiblyEvaluatedType = Faded<T>; |