From 1d89f6602aae6bc826d846bc5889a71ea4dd7e66 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Thu, 14 Sep 2023 09:22:18 +0200
Subject: [PATCH] JNI: Don't explicitly specify deducible template arguments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Minor cleanup that enables us to change the actual type in some of the
wrapper functions, so that we can implicitly convert a QString to a
jstring.

Change-Id: I2acc99c656231b302269fae439cf3dd49278f09a
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
---
 src/corelib/kernel/qjniobject.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/corelib/kernel/qjniobject.h b/src/corelib/kernel/qjniobject.h
index de73676630..ff5d81e1a3 100644
--- a/src/corelib/kernel/qjniobject.h
+++ b/src/corelib/kernel/qjniobject.h
@@ -98,11 +98,7 @@ public:
     auto callMethod(const char *methodName, Args &&...args) const
     {
         constexpr auto signature = QtJniTypes::methodSignature<Ret, Args...>();
-        if constexpr (std::is_same_v<Ret, void>) {
-            callMethod<void>(methodName, signature.data(), std::forward<Args>(args)...);
-        } else {
-            return callMethod<Ret>(methodName, signature.data(), std::forward<Args>(args)...);
-        }
+        return callMethod<Ret>(methodName, signature.data(), std::forward<Args>(args)...);
     }
 
     template <typename Ret, typename ...Args
@@ -132,7 +128,7 @@ public:
     {
         QJniEnvironment env;
         jmethodID id = getMethodID(env.jniEnv(), clazz, methodName, signature, true);
-        return callStaticMethod<Ret, Args...>(clazz, id, std::forward<Args>(args)...);
+        return callStaticMethod<Ret>(clazz, id, std::forward<Args>(args)...);
     }
 
     template <typename Ret, typename ...Args
@@ -172,7 +168,7 @@ public:
     {
         QJniEnvironment env;
         jclass clazz = QJniObject::loadClass(className, env.jniEnv());
-        return callStaticMethod<Ret, Args...>(clazz, methodName, std::forward<Args>(args)...);
+        return callStaticMethod<Ret>(clazz, methodName, std::forward<Args>(args)...);
     }
 
     template <typename Ret, typename ...Args