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

JNI: don't depend on Qt-specific container API in QJniArray

Browse Source 
Use std::size, std::data, std::begin instead of member functions that
do not exist in e.g. std::initializer_list or arrays.

Change-Id: I073b69f51ef93c2fe87104f1d7f8fbed3c603b33
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Volker Hilsheimer 2024-02-01 10:07:52 +01:00
parent a730c42608
commit a0fbe7712c
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +10,9 @@
#include <QtCore/qbytearray.h> #include <QtCore/qbytearray.h>
#include <QtCore/qjniobject.h> #include <QtCore/qjniobject.h>
#include <iterator>
#include <utility> #include <utility>
#include <type_traits> #include <QtCore/q20type_traits.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -90,8 +91,9 @@ class QJniArrayBase
// for SFINAE'ing out the fromContainer named constructor // for SFINAE'ing out the fromContainer named constructor
template <typename Container, typename = void> struct CanConvertHelper : std::false_type {}; template <typename Container, typename = void> struct CanConvertHelper : std::false_type {};
template <typename Container> template <typename Container>
struct CanConvertHelper<Container, std::void_t<decltype(std::declval<Container>().data()), struct CanConvertHelper<Container, std::void_t<decltype(std::data(std::declval<Container>())),
decltype(std::declval<Container>().size()) decltype(std::size(std::declval<Container>())),
typename Container::value_type
> >
> : std::true_type {}; > : std::true_type {};
@ -113,7 +115,7 @@ public:
} }
template <typename Container> template <typename Container>
static constexpr bool canConvert = CanConvertHelper<Container>::value; static constexpr bool canConvert = CanConvertHelper<q20::remove_cvref_t<Container>>::value;
template <typename Container> template <typename Container>
using IfCanConvert = std::enable_if_t<canConvert<Container>, bool>; using IfCanConvert = std::enable_if_t<canConvert<Container>, bool>;
template <typename Container template <typename Container
@ -121,7 +123,7 @@ public:
> >
static auto fromContainer(Container &&container) static auto fromContainer(Container &&container)
{ {
Q_ASSERT_X(size_t(container.size()) <= size_t((std::numeric_limits<size_type>::max)()), Q_ASSERT_X(size_t(std::size(container)) <= size_t((std::numeric_limits<size_type>::max)()),
"QJniArray::fromContainer", "Container is too large for a Java array"); "QJniArray::fromContainer", "Container is too large for a Java array");
using ElementType = typename std::remove_reference_t<Container>::value_type; using ElementType = typename std::remove_reference_t<Container>::value_type;
@ -356,7 +358,7 @@ public:
template <typename ElementType, typename List, typename NewFn, typename SetFn> template <typename ElementType, typename List, typename NewFn, typename SetFn>
auto QJniArrayBase::makeArray(List &&list, NewFn &&newArray, SetFn &&setRegion) auto QJniArrayBase::makeArray(List &&list, NewFn &&newArray, SetFn &&setRegion)
{ {
const size_type length = size_type(list.size()); const size_type length = size_type(std::size(list));
JNIEnv *env = QJniEnvironment::getJniEnv(); JNIEnv *env = QJniEnvironment::getJniEnv();
auto localArray = (env->*newArray)(length); auto localArray = (env->*newArray)(length);
if (QJniEnvironment::checkAndClearExceptions(env)) if (QJniEnvironment::checkAndClearExceptions(env))
@ -365,7 +367,7 @@ auto QJniArrayBase::makeArray(List &&list, NewFn &&newArray, SetFn &&setRegion)
// can't use static_cast here because we have signed/unsigned mismatches // can't use static_cast here because we have signed/unsigned mismatches
if (length) { if (length) {
(env->*setRegion)(localArray, 0, length, (env->*setRegion)(localArray, 0, length,
reinterpret_cast<const ElementType *>(std::as_const(list).data())); reinterpret_cast<const ElementType *>(std::data(std::as_const(list))));
} }
return QJniArray<ElementType>(localArray); return QJniArray<ElementType>(localArray);
}; };
@ -378,21 +380,21 @@ auto QJniArrayBase::makeObjectArray(List &&list)
std::declval<ElementType>())) std::declval<ElementType>()))
>; >;
if (list.isEmpty()) if (std::size(list) == 0)
return ResultType(); return ResultType();
JNIEnv *env = QJniEnvironment::getJniEnv(); JNIEnv *env = QJniEnvironment::getJniEnv();
const size_type length = size_type(list.size()); const size_type length = size_type(std::size(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::disjunction_v<std::is_same<ElementType, QJniObject>, if constexpr (std::disjunction_v<std::is_same<ElementType, QJniObject>,
std::is_base_of<QtJniTypes::JObjectBase, ElementType>>) { std::is_base_of<QtJniTypes::JObjectBase, ElementType>>) {
elementClass = list.first().objectClass(); elementClass = std::begin(list)->objectClass();
} else if constexpr (std::is_same_v<ElementType, QString>) { } else if constexpr (std::is_same_v<ElementType, QString>) {
elementClass = env->FindClass("java/lang/String"); elementClass = env->FindClass("java/lang/String");
} else { } else {
elementClass = env->GetObjectClass(list.first()); elementClass = env->GetObjectClass(*std::begin(list));
} }
auto localArray = env->NewObjectArray(length, elementClass, nullptr); auto localArray = env->NewObjectArray(length, elementClass, nullptr);
if (QJniEnvironment::checkAndClearExceptions(env)) if (QJniEnvironment::checkAndClearExceptions(env))