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/text/collator_jni.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/text/collator_jni.hpp')
-rw-r--r-- | platform/android/src/text/collator_jni.hpp | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/platform/android/src/text/collator_jni.hpp b/platform/android/src/text/collator_jni.hpp index 96c381b1c1..dd3f845662 100644 --- a/platform/android/src/text/collator_jni.hpp +++ b/platform/android/src/text/collator_jni.hpp @@ -24,33 +24,40 @@ public: static jni::Object<Locale> forLanguageTag(jni::JNIEnv&, jni::String); static jni::String toLanguageTag(jni::JNIEnv&, jni::Object<Locale>); */ - static jni::Object<Locale> getDefault(jni::JNIEnv&); - static jni::String getLanguage(jni::JNIEnv&, jni::Object<Locale>); - static jni::String getCountry(jni::JNIEnv&, jni::Object<Locale>); + static jni::Local<jni::Object<Locale>> getDefault(jni::JNIEnv&); + static jni::Local<jni::String> getLanguage(jni::JNIEnv&, const jni::Object<Locale>&); + static jni::Local<jni::String> getCountry(jni::JNIEnv&, const jni::Object<Locale>&); - static jni::Object<Locale> New(jni::JNIEnv&, jni::String); - static jni::Object<Locale> New(jni::JNIEnv&, jni::String, jni::String); + static jni::Local<jni::Object<Locale>> New(jni::JNIEnv&, const jni::String&); + static jni::Local<jni::Object<Locale>> New(jni::JNIEnv&, const jni::String&, const jni::String&); - static jni::Class<Locale> javaClass; static void registerNative(jni::JNIEnv&); - }; class Collator { public: static constexpr auto Name() { return "java/text/Collator"; }; - static jni::Object<Collator> getInstance(jni::JNIEnv&, jni::Object<Locale>); + static jni::Local<jni::Object<Collator>> getInstance(jni::JNIEnv&, const jni::Object<Locale>&); - static void setStrength(jni::JNIEnv&, jni::Object<Collator>, jni::jint); + static void setStrength(jni::JNIEnv&, const jni::Object<Collator>&, jni::jint); - static jni::jint compare(jni::JNIEnv&, jni::Object<Collator>, jni::String, jni::String); + static jni::jint compare(jni::JNIEnv&, const jni::Object<Collator>&, const jni::String&, const jni::String&); - static jni::Class<Collator> javaClass; static void registerNative(jni::JNIEnv&); +}; + + +class StringUtils { +public: + static constexpr auto Name() { return "com/mapbox/mapboxsdk/utils/StringUtils"; }; + + static jni::Local<jni::String> unaccent(jni::JNIEnv&, const jni::String&); + + static void registerNative(jni::JNIEnv&); }; } // namespace android |