Replace conversion operator by operator* in QJniEnvironment

Since conversion operators do implicit conversion that might bring
some potential issues while using the API, let's stick to having
an operator* instead.

Pick-to: 6.1 6.1.0
Change-Id: Ie7ad5537958944b8d1c11d69fbd30284b4b0344d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 16 insertions, 6 deletions

diff --git a/src/corelib/kernel/qjnienvironment.cpp b/src/corelib/kernel/qjnienvironment.cpp
index 0c9aa27e82..522c97bdc1 100644
--- a/src/corelib/kernel/qjnienvironment.cpp
+++ b/src/corelib/kernel/qjnienvironment.cpp
@@ -136,21 +136,31 @@ QJniEnvironment::~QJniEnvironment()
 }
 
 /*!
-    \fn JNIEnv *QJniEnvironment::operator->()
+    \fn JNIEnv *QJniEnvironment::operator->() const
 
-    Provides access to the QJniEnvironment's JNIEnv pointer.
+    Provides access to the JNI Environment's \c JNIEnv pointer.
 */
-JNIEnv *QJniEnvironment::operator->()
+JNIEnv *QJniEnvironment::operator->() const
 {
     return d->jniEnv;
 }
 
 /*!
-    \fn QJniEnvironment::operator JNIEnv *() const
+    \fn JNIEnv &QJniEnvironment::operator*() const
 
-    Returns the JNI Environment pointer.
+    Returns the JNI Environment's \c JNIEnv object.
 */
-QJniEnvironment::operator JNIEnv* () const
+JNIEnv &QJniEnvironment::operator*() const
+{
+    return *d->jniEnv;
+}
+
+/*!
+    \fn JNIEnv *QJniEnvironment::jniEnv()
+
+    Returns the JNI Environment's \c JNIEnv pointer.
+*/
+JNIEnv *QJniEnvironment::jniEnv() const
 {
     return d->jniEnv;
 }