diff options
author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
---|---|---|
committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
commit | 98b34cb0dbf5c50d7f319724c93021418140b15f (patch) | |
tree | 11cd51f86b5c672dda6bfe087f40f77df1553971 /platform/android/src/geojson/geometry.hpp | |
parent | ee17d79f9420eb859303d977955454dacc470db6 (diff) | |
parent | 079ba0209ed383c15123902f0810e658c2b0abf4 (diff) | |
download | qtlocation-mapboxgl-98b34cb0dbf5c50d7f319724c93021418140b15f.tar.gz |
Merge remote-tracking branch 'origin' into bwg-vs2017upstream/bwg-vs2017
# Conflicts:
# cmake/mason-dependencies.cmake
Diffstat (limited to 'platform/android/src/geojson/geometry.hpp')
-rw-r--r-- | platform/android/src/geojson/geometry.hpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/platform/android/src/geojson/geometry.hpp b/platform/android/src/geojson/geometry.hpp index a1bb886683..4bf55c858b 100644 --- a/platform/android/src/geojson/geometry.hpp +++ b/platform/android/src/geojson/geometry.hpp @@ -1,7 +1,6 @@ #pragma once #include <mbgl/util/geometry.hpp> -#include <mbgl/util/noncopyable.hpp> #include "../java/util.hpp" @@ -11,17 +10,15 @@ namespace mbgl { namespace android { namespace geojson { -class Geometry : private mbgl::util::noncopyable { +class Geometry { public: static constexpr auto Name() { return "com/mapbox/geojson/Geometry"; }; - static jni::Object<Geometry> New(jni::JNIEnv&, mbgl::Geometry<double>); + static jni::Local<jni::Object<Geometry>> New(jni::JNIEnv&, mbgl::Geometry<double>); - static mbgl::Geometry<double> convert(jni::JNIEnv&, jni::Object<Geometry>); + static mbgl::Geometry<double> convert(jni::JNIEnv&, const jni::Object<Geometry>&); - static std::string getType(jni::JNIEnv&, jni::Object<Geometry>); - - static jni::Class<Geometry> javaClass; + static std::string getType(jni::JNIEnv&, const jni::Object<Geometry>&); static void registerNative(jni::JNIEnv&); }; |