diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2017-03-22 15:05:03 +0200 |
|---|---|---|
| committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-03-28 15:44:22 +0300 |
| commit | fa7489fb7ea8ec85cb746e0bc497518d72c638b9 (patch) | |
| tree | 477c100890466ca0093af9e101554dca530f9ae8 /platform/android/src/style/value.cpp | |
| parent | f70f604e5b99062a24764716ccdeda64c36320be (diff) | |
| download | qtlocation-mapboxgl-fa7489fb7ea8ec85cb746e0bc497518d72c638b9.tar.gz | |
[android] geojson conversion optimisation
Diffstat (limited to 'platform/android/src/style/value.cpp')
| -rw-r--r-- | platform/android/src/style/value.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/platform/android/src/style/value.cpp b/platform/android/src/style/value.cpp index da953c14be..e1cd81d7fd 100644 --- a/platform/android/src/style/value.cpp +++ b/platform/android/src/style/value.cpp @@ -22,7 +22,7 @@ namespace android { // Instance - Value::Value(jni::JNIEnv& env, jni::jobject* _value) : jenv(env), value(_value, ObjectDeleter(env)) {} + Value::Value(jni::JNIEnv& _env, jni::jobject* _value) : env(_env), value(_value, ObjectDeleter(env)) {} Value::~Value() = default; @@ -31,59 +31,59 @@ namespace android { } bool Value::isArray() const { - return jni::IsInstanceOf(jenv, value.get(), *java::ObjectArray::jclass); + return jni::IsInstanceOf(env, value.get(), *java::ObjectArray::jclass); } bool Value::isObject() const { - return jni::IsInstanceOf(jenv, value.get(), *java::Map::jclass);; + return jni::IsInstanceOf(env, value.get(), *java::Map::jclass);; } bool Value::isString() const { - return jni::IsInstanceOf(jenv, value.get(), *java::String::jclass); + return jni::IsInstanceOf(env, value.get(), *java::String::jclass); } bool Value::isBool() const { - return jni::IsInstanceOf(jenv, value.get(), *java::Boolean::jclass); + return jni::IsInstanceOf(env, value.get(), *java::Boolean::jclass); } bool Value::isNumber() const { - return jni::IsInstanceOf(jenv, value.get(), *java::Number::jclass); + return jni::IsInstanceOf(env, value.get(), *java::Number::jclass); } std::string Value::toString() const { jni::jstring* string = reinterpret_cast<jni::jstring*>(value.get()); - return jni::Make<std::string>(jenv, jni::String(string)); + return jni::Make<std::string>(env, jni::String(string)); } float Value::toFloat() const { - return jni::CallMethod<jni::jfloat>(jenv, value.get(), *java::Number::floatValueMethodId); + return jni::CallMethod<jni::jfloat>(env, value.get(), *java::Number::floatValueMethodId); } double Value::toDouble() const { - return jni::CallMethod<jni::jdouble>(jenv, value.get(), *java::Number::doubleValueMethodId); + return jni::CallMethod<jni::jdouble>(env, value.get(), *java::Number::doubleValueMethodId); } long Value::toLong() const { - return jni::CallMethod<jni::jlong>(jenv, value.get(), *java::Number::longValueMethodId); + return jni::CallMethod<jni::jlong>(env, value.get(), *java::Number::longValueMethodId); } bool Value::toBool() const { - return jni::CallMethod<jni::jboolean>(jenv, value.get(), *java::Boolean::booleanValueMethodId); + return jni::CallMethod<jni::jboolean>(env, value.get(), *java::Boolean::booleanValueMethodId); } Value Value::get(const char* key) const { - jni::jobject* member = jni::CallMethod<jni::jobject*>(jenv, value.get(), *java::Map::getMethodId, jni::Make<jni::String>(jenv, std::string(key)).Get()); - return Value(jenv, member); + jni::jobject* member = jni::CallMethod<jni::jobject*>(env, value.get(), *java::Map::getMethodId, jni::Make<jni::String>(env, std::string(key)).Get()); + return Value(env, member); } int Value::getLength() const { auto array = (jni::jarray<jni::jobject>*) value.get(); - return jni::GetArrayLength(jenv, *array); + return jni::GetArrayLength(env, *array); } - Value Value::get(const int index ) const { + Value Value::get(const int index) const { auto array = (jni::jarray<jni::jobject>*) value.get(); - return Value(jenv, jni::GetObjectArrayElement(jenv, *array, index)); + return Value(env, jni::GetObjectArrayElement(env, *array, index)); } } } |
