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/graphics/rectf.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/graphics/rectf.hpp')
-rw-r--r-- | platform/android/src/graphics/rectf.hpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/platform/android/src/graphics/rectf.hpp b/platform/android/src/graphics/rectf.hpp index 0f3a7756d5..ba611f2262 100644 --- a/platform/android/src/graphics/rectf.hpp +++ b/platform/android/src/graphics/rectf.hpp @@ -12,18 +12,15 @@ public: static constexpr auto Name() { return "android/graphics/RectF"; }; - static float getLeft(jni::JNIEnv&, jni::Object<RectF>); + static float getLeft(jni::JNIEnv&, const jni::Object<RectF>&); - static float getTop(jni::JNIEnv&, jni::Object<RectF>); + static float getTop(jni::JNIEnv&, const jni::Object<RectF>&); - static float getRight(jni::JNIEnv&, jni::Object<RectF>); + static float getRight(jni::JNIEnv&, const jni::Object<RectF>&); - static float getBottom(jni::JNIEnv&, jni::Object<RectF>); - - static jni::Class<RectF> javaClass; + static float getBottom(jni::JNIEnv&, const jni::Object<RectF>&); static void registerNative(jni::JNIEnv&); - }; |