diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-04-09 20:36:38 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2018-04-09 20:39:29 +0200 |
commit | 9a1c3f452d3599e6680999913b4639ff623259a4 (patch) | |
tree | ce58c070f279f84bd892aeb40982e227fcb87f63 | |
parent | 222a2c0c69fcf3cfaed787421079a133c3f715bc (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-rework-expression-conversion.tar.gz |
[android] - pass const reference, not const valueupstream/tvn-rework-expression-conversion
-rw-r--r-- | platform/android/src/gson/json_array.cpp | 6 | ||||
-rw-r--r-- | platform/android/src/gson/json_array.hpp | 2 | ||||
-rw-r--r-- | platform/android/src/gson/json_element.cpp | 2 | ||||
-rw-r--r-- | platform/android/src/gson/json_element.hpp | 2 | ||||
-rw-r--r-- | platform/android/src/gson/json_object.cpp | 2 | ||||
-rw-r--r-- | platform/android/src/gson/json_object.hpp | 2 | ||||
-rw-r--r-- | platform/android/src/gson/json_primitive.cpp | 2 | ||||
-rw-r--r-- | platform/android/src/gson/json_primitive.hpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/platform/android/src/gson/json_array.cpp b/platform/android/src/gson/json_array.cpp index 84e4eee30f..e8852d77e9 100644 --- a/platform/android/src/gson/json_array.cpp +++ b/platform/android/src/gson/json_array.cpp @@ -6,7 +6,7 @@ namespace mbgl { namespace android { namespace gson { -jni::Object<JsonArray> JsonArray::New(jni::JNIEnv& env, const std::vector<mapbox::geometry::value> values){ +jni::Object<JsonArray> JsonArray::New(jni::JNIEnv& env, const std::vector<mapbox::geometry::value>& values){ static auto constructor = JsonArray::javaClass.GetConstructor(env); static auto addMethod = JsonArray::javaClass.GetMethod<void (jni::Object<JsonElement>)>(env, "add"); @@ -21,7 +21,7 @@ jni::Object<JsonArray> JsonArray::New(jni::JNIEnv& env, const std::vector<mapbox return jsonArray; } -std::vector<mapbox::geometry::value> JsonArray::convert(jni::JNIEnv &env, const jni::Object<JsonArray> jsonArray) { +std::vector<mapbox::geometry::value> JsonArray::convert(jni::JNIEnv& env, const jni::Object<JsonArray> jsonArray) { std::vector<mapbox::geometry::value> values; if (jsonArray) { @@ -43,7 +43,7 @@ std::vector<mapbox::geometry::value> JsonArray::convert(jni::JNIEnv &env, const return values; } -void JsonArray::registerNative(jni::JNIEnv &env) { +void JsonArray::registerNative(jni::JNIEnv& env) { // Lookup the class javaClass = *jni::Class<JsonArray>::Find(env).NewGlobalRef(env).release(); } diff --git a/platform/android/src/gson/json_array.hpp b/platform/android/src/gson/json_array.hpp index 9f55b47a37..c9ae98692f 100644 --- a/platform/android/src/gson/json_array.hpp +++ b/platform/android/src/gson/json_array.hpp @@ -13,7 +13,7 @@ class JsonArray : private mbgl::util::noncopyable { public: static constexpr auto Name() { return "com/google/gson/JsonArray"; }; - static jni::Object<JsonArray> New(jni::JNIEnv&, std::vector<mapbox::geometry::value>); + static jni::Object<JsonArray> New(jni::JNIEnv&, const std::vector<mapbox::geometry::value>&); static std::vector<mapbox::geometry::value> convert(JNIEnv&, jni::Object<JsonArray>); diff --git a/platform/android/src/gson/json_element.cpp b/platform/android/src/gson/json_element.cpp index 7d904d2276..5eaaf531f4 100644 --- a/platform/android/src/gson/json_element.cpp +++ b/platform/android/src/gson/json_element.cpp @@ -34,7 +34,7 @@ public: }; -jni::Object<JsonElement> JsonElement::New(jni::JNIEnv& env, mapbox::geometry::value value) { +jni::Object<JsonElement> JsonElement::New(jni::JNIEnv& env, const mapbox::geometry::value& value) { JsonElementEvaluator evaluator { env } ; return mapbox::geometry::value::visit(value, evaluator); } diff --git a/platform/android/src/gson/json_element.hpp b/platform/android/src/gson/json_element.hpp index 05d9715a7f..d850caa526 100644 --- a/platform/android/src/gson/json_element.hpp +++ b/platform/android/src/gson/json_element.hpp @@ -13,7 +13,7 @@ class JsonElement : private mbgl::util::noncopyable { public: static constexpr auto Name() { return "com/google/gson/JsonElement"; }; - static jni::Object<JsonElement> New(jni::JNIEnv&, mapbox::geometry::value); + static jni::Object<JsonElement> New(jni::JNIEnv&, const mapbox::geometry::value&); static mapbox::geometry::value convert(JNIEnv&, jni::Object<JsonElement>); diff --git a/platform/android/src/gson/json_object.cpp b/platform/android/src/gson/json_object.cpp index 07eb37b1c8..61b55f8b9e 100644 --- a/platform/android/src/gson/json_object.cpp +++ b/platform/android/src/gson/json_object.cpp @@ -9,7 +9,7 @@ namespace android { namespace gson { -jni::Object<JsonObject> JsonObject::New(jni::JNIEnv& env, const std::unordered_map<std::string, mapbox::geometry::value> values) { +jni::Object<JsonObject> JsonObject::New(jni::JNIEnv& env, const std::unordered_map<std::string, mapbox::geometry::value>& values) { static auto constructor = JsonObject::javaClass.GetConstructor(env); static auto addMethod = JsonObject::javaClass.GetMethod<void (jni::String, jni::Object<JsonElement>)>(env, "add"); diff --git a/platform/android/src/gson/json_object.hpp b/platform/android/src/gson/json_object.hpp index bd4a1bfb14..4bc61e51a2 100644 --- a/platform/android/src/gson/json_object.hpp +++ b/platform/android/src/gson/json_object.hpp @@ -13,7 +13,7 @@ class JsonObject : private mbgl::util::noncopyable { public: static constexpr auto Name() { return "com/google/gson/JsonObject"; }; - static jni::Object<JsonObject> New(jni::JNIEnv&, std::unordered_map<std::string, mapbox::geometry::value>); + static jni::Object<JsonObject> New(jni::JNIEnv&, const std::unordered_map<std::string, mapbox::geometry::value>&); static mapbox::geometry::property_map convert(JNIEnv&, jni::Object<JsonObject>); diff --git a/platform/android/src/gson/json_primitive.cpp b/platform/android/src/gson/json_primitive.cpp index c11ca9fec9..4e171c4845 100644 --- a/platform/android/src/gson/json_primitive.cpp +++ b/platform/android/src/gson/json_primitive.cpp @@ -79,7 +79,7 @@ public: } }; -jni::Object<JsonPrimitive> JsonPrimitive::New(jni::JNIEnv &env, value value) { +jni::Object<JsonPrimitive> JsonPrimitive::New(jni::JNIEnv &env, const value& value) { JsonPrimitiveEvaluator evaluator { env }; return value::visit(value, evaluator); } diff --git a/platform/android/src/gson/json_primitive.hpp b/platform/android/src/gson/json_primitive.hpp index 40a3928ee6..c418e0ebe8 100644 --- a/platform/android/src/gson/json_primitive.hpp +++ b/platform/android/src/gson/json_primitive.hpp @@ -15,7 +15,7 @@ public: static constexpr auto Name() { return "com/google/gson/JsonPrimitive"; }; - static jni::Object<JsonPrimitive> New(jni::JNIEnv&, value); + static jni::Object<JsonPrimitive> New(jni::JNIEnv&, const value&); static value convert(JNIEnv&, jni::Object<JsonPrimitive>); |