diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-10-29 14:29:16 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-10-30 16:23:31 +0200 |
commit | 99e1a8a3df1a08464d8529b6988c1665b87c7c8b (patch) | |
tree | 4d45675ef4b54d00d7ef2a4dccbc211522515dce /platform/android/src/style/layers/background_layer.cpp | |
parent | 2ef9580565e2125e07124d23c0bcf400c8736931 (diff) | |
download | qtlocation-mapboxgl-99e1a8a3df1a08464d8529b6988c1665b87c7c8b.tar.gz |
Remove style::Layer::is()/as()upstream/mikhail_drop_style_layer_cast
Diffstat (limited to 'platform/android/src/style/layers/background_layer.cpp')
-rw-r--r-- | platform/android/src/style/layers/background_layer.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/platform/android/src/style/layers/background_layer.cpp b/platform/android/src/style/layers/background_layer.cpp index c806e8471f..45ec9380d0 100644 --- a/platform/android/src/style/layers/background_layer.cpp +++ b/platform/android/src/style/layers/background_layer.cpp @@ -10,6 +10,10 @@ namespace mbgl { namespace android { + inline mbgl::style::BackgroundLayer& toBackgroundLayer(mbgl::style::Layer& layer) { + return static_cast<mbgl::style::BackgroundLayer&>(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<jni::Object<>> BackgroundLayer::getBackgroundColor(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert<jni::Local<jni::Object<>>>(env, layer.as<mbgl::style::BackgroundLayer>()->BackgroundLayer::getBackgroundColor())); + return std::move(*convert<jni::Local<jni::Object<>>>(env, toBackgroundLayer(layer).getBackgroundColor())); } jni::Local<jni::Object<TransitionOptions>> BackgroundLayer::getBackgroundColorTransition(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as<mbgl::style::BackgroundLayer>()->BackgroundLayer::getBackgroundColorTransition(); + mbgl::style::TransitionOptions options = toBackgroundLayer(layer).getBackgroundColorTransition(); return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(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<mbgl::style::BackgroundLayer>()->BackgroundLayer::setBackgroundColorTransition(options); + toBackgroundLayer(layer).setBackgroundColorTransition(options); } jni::Local<jni::Object<>> BackgroundLayer::getBackgroundPattern(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert<jni::Local<jni::Object<>>>(env, layer.as<mbgl::style::BackgroundLayer>()->BackgroundLayer::getBackgroundPattern())); + return std::move(*convert<jni::Local<jni::Object<>>>(env, toBackgroundLayer(layer).getBackgroundPattern())); } jni::Local<jni::Object<TransitionOptions>> BackgroundLayer::getBackgroundPatternTransition(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as<mbgl::style::BackgroundLayer>()->BackgroundLayer::getBackgroundPatternTransition(); + mbgl::style::TransitionOptions options = toBackgroundLayer(layer).getBackgroundPatternTransition(); return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(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<mbgl::style::BackgroundLayer>()->BackgroundLayer::setBackgroundPatternTransition(options); + toBackgroundLayer(layer).setBackgroundPatternTransition(options); } jni::Local<jni::Object<>> BackgroundLayer::getBackgroundOpacity(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - return std::move(*convert<jni::Local<jni::Object<>>>(env, layer.as<mbgl::style::BackgroundLayer>()->BackgroundLayer::getBackgroundOpacity())); + return std::move(*convert<jni::Local<jni::Object<>>>(env, toBackgroundLayer(layer).getBackgroundOpacity())); } jni::Local<jni::Object<TransitionOptions>> BackgroundLayer::getBackgroundOpacityTransition(jni::JNIEnv& env) { using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as<mbgl::style::BackgroundLayer>()->BackgroundLayer::getBackgroundOpacityTransition(); + mbgl::style::TransitionOptions options = toBackgroundLayer(layer).getBackgroundOpacityTransition(); return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options)); } @@ -86,7 +90,7 @@ namespace android { mbgl::style::TransitionOptions options; options.duration.emplace(mbgl::Milliseconds(duration)); options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as<mbgl::style::BackgroundLayer>()->BackgroundLayer::setBackgroundOpacityTransition(options); + toBackgroundLayer(layer).setBackgroundOpacityTransition(options); } |