diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-04-13 11:54:33 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-15 10:10:46 +0000 |
| commit | db786b4774ee0ce6ceff9ae247399b9b9f354ad4 (patch) | |
| tree | 2399b5256aa0a58490006bce6362c12bb9be2e3e /src/plugins | |
| parent | ada12ec960bd05c62eb4a9acea84516a8a642d3a (diff) | |
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.
Change-Id: Ie7ad5537958944b8d1c11d69fbd30284b4b0344d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 13592385723a9b81b3715b5344bdd04e6a393a12)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/android/androidjnimain.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformmenu.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformopenglwindow.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index ab31617900..7b1182066d 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -320,7 +320,7 @@ namespace QtAndroid int createSurface(AndroidSurfaceClient *client, const QRect &geometry, bool onTop, int imageDepth) { QJniEnvironment env; - if (!env) + if (!env.jniEnv()) return -1; m_surfacesMutex.lock(); @@ -383,7 +383,7 @@ namespace QtAndroid return; QJniEnvironment env; - if (!env) + if (!env.jniEnv()) return; jint x = 0, y = 0, w = -1, h = -1; if (!geometry.isNull()) { @@ -412,7 +412,7 @@ namespace QtAndroid } QJniEnvironment env; - if (env) + if (env.jniEnv()) env->CallStaticVoidMethod(m_applicationClass, m_destroySurfaceMethodID, surfaceId); diff --git a/src/plugins/platforms/android/qandroidplatformmenu.cpp b/src/plugins/platforms/android/qandroidplatformmenu.cpp index 1ac836faf2..8d79331f03 100644 --- a/src/plugins/platforms/android/qandroidplatformmenu.cpp +++ b/src/plugins/platforms/android/qandroidplatformmenu.cpp @@ -155,7 +155,7 @@ void QAndroidPlatformMenu::showPopup(const QWindow *parentWindow, const QRect &t Q_UNUSED(parentWindow); Q_UNUSED(item); setVisible(true); - QtAndroidMenu::showContextMenu(this, targetRect, QJniEnvironment()); + QtAndroidMenu::showContextMenu(this, targetRect, QJniEnvironment().jniEnv()); } QPlatformMenuItem *QAndroidPlatformMenu::menuItemForTag(quintptr tag) const diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp index f69e9e389f..2020f02456 100644 --- a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp +++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp @@ -176,7 +176,7 @@ void QAndroidPlatformOpenGLWindow::createEgl(EGLConfig config) { clearEgl(); QJniEnvironment env; - m_nativeWindow = ANativeWindow_fromSurface(env, m_androidSurfaceObject.object()); + m_nativeWindow = ANativeWindow_fromSurface(env.jniEnv(), m_androidSurfaceObject.object()); m_androidSurfaceObject = QJniObject(); m_eglSurface = eglCreateWindowSurface(m_eglDisplay, config, m_nativeWindow, NULL); m_format = q_glFormatFromConfig(m_eglDisplay, config, window()->requestedFormat()); |