diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-06 11:45:51 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-07 16:34:20 +0200 |
commit | 1ba1ead3eab5eb27c24163b93b04b49ffbdf2a3b (patch) | |
tree | 2bf5c6b89849bd1c50b16e00219ed66d784c0be8 /platform/android/src/style | |
parent | 6f34e69b2e7bfb61ae4a1c88799397f18d4175a3 (diff) | |
download | qtlocation-mapboxgl-1ba1ead3eab5eb27c24163b93b04b49ffbdf2a3b.tar.gz |
[android] Remove UnknownLayer
Diffstat (limited to 'platform/android/src/style')
-rw-r--r-- | platform/android/src/style/layers/unknown_layer.cpp | 48 | ||||
-rw-r--r-- | platform/android/src/style/layers/unknown_layer.hpp | 28 |
2 files changed, 0 insertions, 76 deletions
diff --git a/platform/android/src/style/layers/unknown_layer.cpp b/platform/android/src/style/layers/unknown_layer.cpp deleted file mode 100644 index bf311aff37..0000000000 --- a/platform/android/src/style/layers/unknown_layer.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "unknown_layer.hpp" - -#include <string> - -namespace { - - // Dummy initializer (We don't support initializing this from the JVM) - std::unique_ptr<mbgl::android::UnknownLayer> init(jni::JNIEnv&) { - throw std::runtime_error("UnknownLayer should not be initialized from the JVM"); - } - -} // namespace - -namespace mbgl { -namespace android { - - UnknownLayer::UnknownLayer(mbgl::Map& map, mbgl::style::Layer& coreLayer) - : Layer(map, coreLayer) { - } - - UnknownLayer::UnknownLayer(mbgl::Map& map, std::unique_ptr<mbgl::style::Layer> coreLayer) - : Layer(map, std::move(coreLayer)) { - } - - jni::Local<jni::Object<Layer>> UnknownLayer::createJavaPeer(jni::JNIEnv& env, Layer* layer) { - static auto& javaClass = jni::Class<UnknownLayer>::Singleton(env); - static auto constructor = javaClass.GetConstructor<jni::jlong>(env); - return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer)); - } - - void UnknownLayer::registerNative(jni::JNIEnv& env) { - // Lookup the class - static auto& javaClass = jni::Class<UnknownLayer>::Singleton(env); - - #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name) - - std::function<std::unique_ptr<UnknownLayer>(JNIEnv&)> initializer = nullptr; - - // Register the peer - jni::RegisterNativePeer<UnknownLayer>( - env, javaClass, "nativePtr", - init, - "initialize", - "finalize"); - } - -} // namespace android -} // namespace mbgl diff --git a/platform/android/src/style/layers/unknown_layer.hpp b/platform/android/src/style/layers/unknown_layer.hpp deleted file mode 100644 index 1b64ba1b3d..0000000000 --- a/platform/android/src/style/layers/unknown_layer.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "layer.hpp" -#include <mbgl/style/layer.hpp> -#include <jni/jni.hpp> - -namespace mbgl { -namespace android { - -class UnknownLayer : public Layer { -public: - using SuperTag = Layer; - static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/UnknownLayer"; }; - - static void registerNative(jni::JNIEnv&); - - UnknownLayer(mbgl::Map&, mbgl::style::Layer&); - - UnknownLayer(mbgl::Map&, std::unique_ptr<mbgl::style::Layer>); - - ~UnknownLayer() = default; - - static jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv&, Layer*); - -}; // class UnknownLayer - -} // namespace android -} // namespace mbgl |