1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JNI: Support declared QtJniTypes in QJniArray

Browse Source 
They can be treated like QJniObject, but are not QJniObject instances.

Change-Id: I419b6d0493f9a0ad3dcc726d48ac4c9ad3e6bc19
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 77e00a4d08498285ea4273e01fda489ae6a7fd8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2024-02-01 10:05:59 +01:00 committed by Qt Cherry-pick Bot
parent 60ee856adb
commit 8ca6eb2b39
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/kernel/qjniarray.h
View File

@ -126,7 +126,9 @@ public:
using ElementType = typename std::remove_reference_t<Container>::value_type; using ElementType = typename std::remove_reference_t<Container>::value_type;
if constexpr (std::disjunction_v<std::is_same<ElementType, jobject>, if constexpr (std::disjunction_v<std::is_same<ElementType, jobject>,
std::is_same<ElementType, QJniObject>>) { std::is_same<ElementType, QJniObject>,
std::is_base_of<QtJniTypes::JObjectBase, ElementType>
>) {
return makeObjectArray(std::forward<Container>(container)); return makeObjectArray(std::forward<Container>(container));
} else if constexpr (std::is_same_v<ElementType, jfloat>) { } else if constexpr (std::is_same_v<ElementType, jfloat>) {
return makeArray<jfloat>(std::forward<Container>(container), &JNIEnv::NewFloatArray, return makeArray<jfloat>(std::forward<Container>(container), &JNIEnv::NewFloatArray,
@ -370,10 +372,12 @@ auto QJniArrayBase::makeObjectArray(List &&list)
// this assumes that all objects in the list have the same class // this assumes that all objects in the list have the same class
jclass elementClass = nullptr; jclass elementClass = nullptr;
if constexpr (std::is_same_v<ElementType, QJniObject>) if constexpr (std::disjunction_v<std::is_same<ElementType, QJniObject>,
std::is_base_of<QtJniTypes::JObjectBase, ElementType>>) {
elementClass = list.first().objectClass(); elementClass = list.first().objectClass();
else } else {
elementClass = env->GetObjectClass(list.first()); elementClass = env->GetObjectClass(list.first());
}
auto localArray = env->NewObjectArray(length, elementClass, nullptr); auto localArray = env->NewObjectArray(length, elementClass, nullptr);
if (QJniEnvironment::checkAndClearExceptions(env)) if (QJniEnvironment::checkAndClearExceptions(env))
return QJniArray<jobject>(); return QJniArray<jobject>();