diff options
author | Tobrun <tobrun@mapbox.com> | 2018-04-10 11:09:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-10 11:09:42 +0200 |
commit | 44ce5ab08792df5f38560016ed3d41712e8025d0 (patch) | |
tree | 83ff99ff7b811e4f54165058df01eb101750c33e /platform/android/src/style/conversion/property_value.hpp | |
parent | 351ac83c75955c7e44e49a42156ece83b759612b (diff) | |
download | qtlocation-mapboxgl-44ce5ab08792df5f38560016ed3d41712e8025d0.tar.gz |
Rework expression conversion (#11490)
* [android] - rework expression conversion
Diffstat (limited to 'platform/android/src/style/conversion/property_value.hpp')
-rw-r--r-- | platform/android/src/style/conversion/property_value.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/android/src/style/conversion/property_value.hpp b/platform/android/src/style/conversion/property_value.hpp index 4ed25eac25..902d1e80b2 100644 --- a/platform/android/src/style/conversion/property_value.hpp +++ b/platform/android/src/style/conversion/property_value.hpp @@ -7,7 +7,6 @@ #include "../../conversion/constant.hpp" #include "types.hpp" #include "function.hpp" -#include "gson.hpp" namespace mbgl { namespace android { @@ -32,15 +31,15 @@ public: } jni::jobject* operator()(const mbgl::style::CameraFunction<T> &value) const { - return *convert<jni::jobject*, mbgl::style::CameraFunction<T>>(env, value); + return *convert<jni::Object<android::gson::JsonElement>, mbgl::style::CameraFunction<T>>(env, value); } jni::jobject* operator()(const mbgl::style::SourceFunction<T> &value) const { - return *convert<jni::jobject*, mbgl::style::SourceFunction<T>>(env, value); + return *convert<jni::Object<android::gson::JsonElement>, mbgl::style::SourceFunction<T>>(env, value); } jni::jobject* operator()(const mbgl::style::CompositeFunction<T> &value) const { - return *convert<jni::jobject*, mbgl::style::CompositeFunction<T>>(env, value); + return *convert<jni::Object<android::gson::JsonElement>, mbgl::style::CompositeFunction<T>>(env, value); } private: |