From 56808731b699d7750726cd88dd06516c63d7f2f0 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Mon, 29 Oct 2018 14:29:16 +0200 Subject: Remove style::Layer::is()/as() --- .../src/style/layers/fill_extrusion_layer.cpp | 42 ++++++++++++---------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'platform/android/src/style/layers/fill_extrusion_layer.cpp') diff --git a/platform/android/src/style/layers/fill_extrusion_layer.cpp b/platform/android/src/style/layers/fill_extrusion_layer.cpp index cf53e774a5..b047f08dc0 100644 --- a/platform/android/src/style/layers/fill_extrusion_layer.cpp +++ b/platform/android/src/style/layers/fill_extrusion_layer.cpp @@ -10,6 +10,10 @@ namespace mbgl { namespace android { + inline mbgl::style::FillExtrusionLayer& toFillExtrusionLayer(mbgl::style::Layer& layer) { + return static_cast(layer); + } + /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ @@ -37,12 +41,12 @@ namespace android { jni::Local> FillExtrusionLayer::getFillExtrusionOpacity(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert>>(env, layer.as()->FillExtrusionLayer::getFillExtrusionOpacity())); + return std::move(*convert>>(env, toFillExtrusionLayer(layer).getFillExtrusionOpacity())); } jni::Local> FillExtrusionLayer::getFillExtrusionOpacityTransition(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as()->FillExtrusionLayer::getFillExtrusionOpacityTransition(); + mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -50,17 +54,17 @@ namespace android { mbgl::style::TransitionOptions options; options.duration.emplace(mbgl::Milliseconds(duration)); options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as()->FillExtrusionLayer::setFillExtrusionOpacityTransition(options); + toFillExtrusionLayer(layer).setFillExtrusionOpacityTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionColor(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert>>(env, layer.as()->FillExtrusionLayer::getFillExtrusionColor())); + return std::move(*convert>>(env, toFillExtrusionLayer(layer).getFillExtrusionColor())); } jni::Local> FillExtrusionLayer::getFillExtrusionColorTransition(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as()->FillExtrusionLayer::getFillExtrusionColorTransition(); + mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionColorTransition(); return std::move(*convert>>(env, options)); } @@ -68,17 +72,17 @@ namespace android { mbgl::style::TransitionOptions options; options.duration.emplace(mbgl::Milliseconds(duration)); options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as()->FillExtrusionLayer::setFillExtrusionColorTransition(options); + toFillExtrusionLayer(layer).setFillExtrusionColorTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionTranslate(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert>>(env, layer.as()->FillExtrusionLayer::getFillExtrusionTranslate())); + return std::move(*convert>>(env, toFillExtrusionLayer(layer).getFillExtrusionTranslate())); } jni::Local> FillExtrusionLayer::getFillExtrusionTranslateTransition(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as()->FillExtrusionLayer::getFillExtrusionTranslateTransition(); + mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionTranslateTransition(); return std::move(*convert>>(env, options)); } @@ -86,22 +90,22 @@ namespace android { mbgl::style::TransitionOptions options; options.duration.emplace(mbgl::Milliseconds(duration)); options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as()->FillExtrusionLayer::setFillExtrusionTranslateTransition(options); + toFillExtrusionLayer(layer).setFillExtrusionTranslateTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionTranslateAnchor(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert>>(env, layer.as()->FillExtrusionLayer::getFillExtrusionTranslateAnchor())); + return std::move(*convert>>(env, toFillExtrusionLayer(layer).getFillExtrusionTranslateAnchor())); } jni::Local> FillExtrusionLayer::getFillExtrusionPattern(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert>>(env, layer.as()->FillExtrusionLayer::getFillExtrusionPattern())); + return std::move(*convert>>(env, toFillExtrusionLayer(layer).getFillExtrusionPattern())); } jni::Local> FillExtrusionLayer::getFillExtrusionPatternTransition(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as()->FillExtrusionLayer::getFillExtrusionPatternTransition(); + mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionPatternTransition(); return std::move(*convert>>(env, options)); } @@ -109,17 +113,17 @@ namespace android { mbgl::style::TransitionOptions options; options.duration.emplace(mbgl::Milliseconds(duration)); options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as()->FillExtrusionLayer::setFillExtrusionPatternTransition(options); + toFillExtrusionLayer(layer).setFillExtrusionPatternTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionHeight(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert>>(env, layer.as()->FillExtrusionLayer::getFillExtrusionHeight())); + return std::move(*convert>>(env, toFillExtrusionLayer(layer).getFillExtrusionHeight())); } jni::Local> FillExtrusionLayer::getFillExtrusionHeightTransition(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as()->FillExtrusionLayer::getFillExtrusionHeightTransition(); + mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionHeightTransition(); return std::move(*convert>>(env, options)); } @@ -127,17 +131,17 @@ namespace android { mbgl::style::TransitionOptions options; options.duration.emplace(mbgl::Milliseconds(duration)); options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as()->FillExtrusionLayer::setFillExtrusionHeightTransition(options); + toFillExtrusionLayer(layer).setFillExtrusionHeightTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionBase(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert>>(env, layer.as()->FillExtrusionLayer::getFillExtrusionBase())); + return std::move(*convert>>(env, toFillExtrusionLayer(layer).getFillExtrusionBase())); } jni::Local> FillExtrusionLayer::getFillExtrusionBaseTransition(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as()->FillExtrusionLayer::getFillExtrusionBaseTransition(); + mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionBaseTransition(); return std::move(*convert>>(env, options)); } @@ -145,7 +149,7 @@ namespace android { mbgl::style::TransitionOptions options; options.duration.emplace(mbgl::Milliseconds(duration)); options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as()->FillExtrusionLayer::setFillExtrusionBaseTransition(options); + toFillExtrusionLayer(layer).setFillExtrusionBaseTransition(options); } -- cgit v1.2.1