AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JNI: reduce code duplication for QJniObject constructors

Browse Source 
Move the shared code into a variadic template construct-function of
the private, which can do the rest.

Change-Id: I98a9a93b7c0452cc28769370e6a1499f1728a72d
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
This commit is contained in:
Volker Hilsheimer 2023-09-22 17:51:44 +02:00
parent b5dd6d98bf
commit 0bd3882acd
1 changed files with 33 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/corelib/kernel/qjniobject.cpp
View File

@ -286,6 +286,27 @@ public:
env->DeleteGlobalRef(m_jclass); env->DeleteGlobalRef(m_jclass);
} }
template <typename ...Args>
void construct(JNIEnv *env, const char *signature = nullptr, Args &&...args)
{
if (m_jclass) {
// get default constructor
jmethodID constructorId = QJniObject::getCachedMethodID(env, m_jclass, m_className, "<init>",
signature ? signature : "()V");
if (constructorId) {
jobject obj = nullptr;
if constexpr (sizeof...(Args) == 0)
obj = env->NewObject(m_jclass, constructorId);
else
obj = env->NewObjectV(m_jclass, constructorId, std::forward<Args>(args)...);
if (obj) {
m_jobject = env->NewGlobalRef(obj);
env->DeleteLocalRef(obj);
}
}
}
}
jobject m_jobject = nullptr; jobject m_jobject = nullptr;
jclass m_jclass = nullptr; jclass m_jclass = nullptr;
bool m_own_jclass = true; bool m_own_jclass = true;
@ -547,17 +568,8 @@ QJniObject::QJniObject(const char *className)
d->m_className = className; d->m_className = className;
d->m_jclass = loadClass(d->m_className, env.jniEnv()); d->m_jclass = loadClass(d->m_className, env.jniEnv());
d->m_own_jclass = false; d->m_own_jclass = false;
if (d->m_jclass) {
// get default constructor d->construct(env.jniEnv());
jmethodID constructorId = getCachedMethodID(env.jniEnv(), "<init>", "()V");
if (constructorId) {
jobject obj = env->NewObject(d->m_jclass, constructorId);
if (obj) {
d->m_jobject = env->NewGlobalRef(obj);
env->DeleteLocalRef(obj);
}
}
}
} }
/*! /*!
@ -580,19 +592,11 @@ QJniObject::QJniObject(const char *className, const char *signature, ...)
d->m_className = className; d->m_className = className;
d->m_jclass = loadClass(d->m_className, env.jniEnv()); d->m_jclass = loadClass(d->m_className, env.jniEnv());
d->m_own_jclass = false; d->m_own_jclass = false;
if (d->m_jclass) {
jmethodID constructorId = getCachedMethodID(env.jniEnv(), "<init>", signature);
if (constructorId) {
va_list args; va_list args;
va_start(args, signature); va_start(args, signature);
jobject obj = env->NewObjectV(d->m_jclass, constructorId, args); d->construct(env.jniEnv(), signature, args);
va_end(args); va_end(args);
if (obj) {
d->m_jobject = env->NewGlobalRef(obj);
env->DeleteLocalRef(obj);
}
}
}
} }
/*! /*!
@ -627,19 +631,10 @@ QJniObject::QJniObject(jclass clazz, const char *signature, ...)
QJniEnvironment env; QJniEnvironment env;
if (clazz) { if (clazz) {
d->m_jclass = static_cast<jclass>(env->NewGlobalRef(clazz)); d->m_jclass = static_cast<jclass>(env->NewGlobalRef(clazz));
if (d->m_jclass) {
jmethodID constructorId = getMethodID(env.jniEnv(), d->m_jclass, "<init>", signature);
if (constructorId) {
va_list args; va_list args;
va_start(args, signature); va_start(args, signature);
jobject obj = env->NewObjectV(d->m_jclass, constructorId, args); d->construct(env.jniEnv(), signature, args);
va_end(args); va_end(args);
if (obj) {
d->m_jobject = env->NewGlobalRef(obj);
env->DeleteLocalRef(obj);
}
}
}
} }
} }
@ -667,21 +662,8 @@ QJniObject::QJniObject(jclass clazz, const char *signature, ...)
*/ */
QJniObject::QJniObject(jclass clazz) QJniObject::QJniObject(jclass clazz)
: d(new QJniObjectPrivate()) : QJniObject(clazz, "()V")
{ {
QJniEnvironment env;
d->m_jclass = static_cast<jclass>(env->NewGlobalRef(clazz));
if (d->m_jclass) {
// get default constructor
jmethodID constructorId = getMethodID(env.jniEnv(), d->m_jclass, "<init>", "()V");
if (constructorId) {
jobject obj = env->NewObject(d->m_jclass, constructorId);
if (obj) {
d->m_jobject = env->NewGlobalRef(obj);
env->DeleteLocalRef(obj);
}
}
}
} }
/*! /*!