[core] *LayerImpl::cascading ⇢ paint

1 files changed, 29 insertions, 29 deletions

diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp
index 13c2d214ce..fb31d97657 100644
--- a/src/mbgl/style/layers/raster_layer.cpp
+++ b/src/mbgl/style/layers/raster_layer.cpp
@@ -29,7 +29,7 @@ Mutable<RasterLayer::Impl> RasterLayer::mutableImpl() const {
 std::unique_ptr<Layer> RasterLayer::cloneRef(const std::string& id_) const {
     auto impl_ = mutableImpl();
     impl_->id = id_;
-    impl_->cascading = RasterPaintProperties::Cascading();
+    impl_->paint = RasterPaintProperties::Cascading();
     return std::make_unique<RasterLayer>(std::move(impl_));
 }
 
@@ -78,26 +78,26 @@ PropertyValue<float> RasterLayer::getDefaultRasterOpacity() {
 }
 
 PropertyValue<float> RasterLayer::getRasterOpacity(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterOpacity>().get(klass);
+    return impl().paint.template get<RasterOpacity>().get(klass);
 }
 
 void RasterLayer::setRasterOpacity(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getRasterOpacity(klass))
         return;
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterOpacity>().set(value, klass);
+    impl_->paint.template get<RasterOpacity>().set(value, klass);
     baseImpl = std::move(impl_);
     observer->onLayerPaintPropertyChanged(*this);
 }
 
 void RasterLayer::setRasterOpacityTransition(const TransitionOptions& value, const optional<std::string>& klass) {
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterOpacity>().setTransition(value, klass);
+    impl_->paint.template get<RasterOpacity>().setTransition(value, klass);
     baseImpl = std::move(impl_);
 }
 
 TransitionOptions RasterLayer::getRasterOpacityTransition(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterOpacity>().getTransition(klass);
+    return impl().paint.template get<RasterOpacity>().getTransition(klass);
 }
 
 PropertyValue<float> RasterLayer::getDefaultRasterHueRotate() {
@@ -105,26 +105,26 @@ PropertyValue<float> RasterLayer::getDefaultRasterHueRotate() {
 }
 
 PropertyValue<float> RasterLayer::getRasterHueRotate(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterHueRotate>().get(klass);
+    return impl().paint.template get<RasterHueRotate>().get(klass);
 }
 
 void RasterLayer::setRasterHueRotate(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getRasterHueRotate(klass))
         return;
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterHueRotate>().set(value, klass);
+    impl_->paint.template get<RasterHueRotate>().set(value, klass);
     baseImpl = std::move(impl_);
     observer->onLayerPaintPropertyChanged(*this);
 }
 
 void RasterLayer::setRasterHueRotateTransition(const TransitionOptions& value, const optional<std::string>& klass) {
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterHueRotate>().setTransition(value, klass);
+    impl_->paint.template get<RasterHueRotate>().setTransition(value, klass);
     baseImpl = std::move(impl_);
 }
 
 TransitionOptions RasterLayer::getRasterHueRotateTransition(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterHueRotate>().getTransition(klass);
+    return impl().paint.template get<RasterHueRotate>().getTransition(klass);
 }
 
 PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMin() {
@@ -132,26 +132,26 @@ PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMin() {
 }
 
 PropertyValue<float> RasterLayer::getRasterBrightnessMin(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterBrightnessMin>().get(klass);
+    return impl().paint.template get<RasterBrightnessMin>().get(klass);
 }
 
 void RasterLayer::setRasterBrightnessMin(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getRasterBrightnessMin(klass))
         return;
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterBrightnessMin>().set(value, klass);
+    impl_->paint.template get<RasterBrightnessMin>().set(value, klass);
     baseImpl = std::move(impl_);
     observer->onLayerPaintPropertyChanged(*this);
 }
 
 void RasterLayer::setRasterBrightnessMinTransition(const TransitionOptions& value, const optional<std::string>& klass) {
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterBrightnessMin>().setTransition(value, klass);
+    impl_->paint.template get<RasterBrightnessMin>().setTransition(value, klass);
     baseImpl = std::move(impl_);
 }
 
 TransitionOptions RasterLayer::getRasterBrightnessMinTransition(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterBrightnessMin>().getTransition(klass);
+    return impl().paint.template get<RasterBrightnessMin>().getTransition(klass);
 }
 
 PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMax() {
@@ -159,26 +159,26 @@ PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMax() {
 }
 
 PropertyValue<float> RasterLayer::getRasterBrightnessMax(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterBrightnessMax>().get(klass);
+    return impl().paint.template get<RasterBrightnessMax>().get(klass);
 }
 
 void RasterLayer::setRasterBrightnessMax(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getRasterBrightnessMax(klass))
         return;
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterBrightnessMax>().set(value, klass);
+    impl_->paint.template get<RasterBrightnessMax>().set(value, klass);
     baseImpl = std::move(impl_);
     observer->onLayerPaintPropertyChanged(*this);
 }
 
 void RasterLayer::setRasterBrightnessMaxTransition(const TransitionOptions& value, const optional<std::string>& klass) {
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterBrightnessMax>().setTransition(value, klass);
+    impl_->paint.template get<RasterBrightnessMax>().setTransition(value, klass);
     baseImpl = std::move(impl_);
 }
 
 TransitionOptions RasterLayer::getRasterBrightnessMaxTransition(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterBrightnessMax>().getTransition(klass);
+    return impl().paint.template get<RasterBrightnessMax>().getTransition(klass);
 }
 
 PropertyValue<float> RasterLayer::getDefaultRasterSaturation() {
@@ -186,26 +186,26 @@ PropertyValue<float> RasterLayer::getDefaultRasterSaturation() {
 }
 
 PropertyValue<float> RasterLayer::getRasterSaturation(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterSaturation>().get(klass);
+    return impl().paint.template get<RasterSaturation>().get(klass);
 }
 
 void RasterLayer::setRasterSaturation(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getRasterSaturation(klass))
         return;
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterSaturation>().set(value, klass);
+    impl_->paint.template get<RasterSaturation>().set(value, klass);
     baseImpl = std::move(impl_);
     observer->onLayerPaintPropertyChanged(*this);
 }
 
 void RasterLayer::setRasterSaturationTransition(const TransitionOptions& value, const optional<std::string>& klass) {
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterSaturation>().setTransition(value, klass);
+    impl_->paint.template get<RasterSaturation>().setTransition(value, klass);
     baseImpl = std::move(impl_);
 }
 
 TransitionOptions RasterLayer::getRasterSaturationTransition(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterSaturation>().getTransition(klass);
+    return impl().paint.template get<RasterSaturation>().getTransition(klass);
 }
 
 PropertyValue<float> RasterLayer::getDefaultRasterContrast() {
@@ -213,26 +213,26 @@ PropertyValue<float> RasterLayer::getDefaultRasterContrast() {
 }
 
 PropertyValue<float> RasterLayer::getRasterContrast(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterContrast>().get(klass);
+    return impl().paint.template get<RasterContrast>().get(klass);
 }
 
 void RasterLayer::setRasterContrast(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getRasterContrast(klass))
         return;
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterContrast>().set(value, klass);
+    impl_->paint.template get<RasterContrast>().set(value, klass);
     baseImpl = std::move(impl_);
     observer->onLayerPaintPropertyChanged(*this);
 }
 
 void RasterLayer::setRasterContrastTransition(const TransitionOptions& value, const optional<std::string>& klass) {
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterContrast>().setTransition(value, klass);
+    impl_->paint.template get<RasterContrast>().setTransition(value, klass);
     baseImpl = std::move(impl_);
 }
 
 TransitionOptions RasterLayer::getRasterContrastTransition(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterContrast>().getTransition(klass);
+    return impl().paint.template get<RasterContrast>().getTransition(klass);
 }
 
 PropertyValue<float> RasterLayer::getDefaultRasterFadeDuration() {
@@ -240,26 +240,26 @@ PropertyValue<float> RasterLayer::getDefaultRasterFadeDuration() {
 }
 
 PropertyValue<float> RasterLayer::getRasterFadeDuration(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterFadeDuration>().get(klass);
+    return impl().paint.template get<RasterFadeDuration>().get(klass);
 }
 
 void RasterLayer::setRasterFadeDuration(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getRasterFadeDuration(klass))
         return;
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterFadeDuration>().set(value, klass);
+    impl_->paint.template get<RasterFadeDuration>().set(value, klass);
     baseImpl = std::move(impl_);
     observer->onLayerPaintPropertyChanged(*this);
 }
 
 void RasterLayer::setRasterFadeDurationTransition(const TransitionOptions& value, const optional<std::string>& klass) {
     auto impl_ = mutableImpl();
-    impl_->cascading.template get<RasterFadeDuration>().setTransition(value, klass);
+    impl_->paint.template get<RasterFadeDuration>().setTransition(value, klass);
     baseImpl = std::move(impl_);
 }
 
 TransitionOptions RasterLayer::getRasterFadeDurationTransition(const optional<std::string>& klass) const {
-    return impl().cascading.template get<RasterFadeDuration>().getTransition(klass);
+    return impl().paint.template get<RasterFadeDuration>().getTransition(klass);
 }
 
 } // namespace style