diff options
| author | Wang Yicun <wangyicun@uniontech.com> | 2021-03-04 17:19:55 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-05 15:35:35 +0000 |
| commit | bb1070e17a1905488837532cef5a6110dd9f0004 (patch) | |
| tree | ec6f4fa898069a4236a1ac948b3b329b999bd223 /src/corelib | |
| parent | d12df462c3fa54afc4daff0e151106e2d42f98d5 (diff) | |
Simplify code, remove redundant condition
'clazz || (!clazz && isCached)' is equivalent to
'clazz || isCached'
Done-with: Tang Peng <tangpeng@uniontech.com>
Change-Id: Ie9eab4a94a61be2b360f64980c4666a622f3a209
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit a913002f13d8a2faad512ffda6c70f413b8e7ee5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qjni.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qjniobject.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp index b593483e59..3750fdb9bc 100644 --- a/src/corelib/kernel/qjni.cpp +++ b/src/corelib/kernel/qjni.cpp @@ -280,9 +280,7 @@ jclass QJNIEnvironmentPrivate::findClass(const char *className, JNIEnv *env) bool isCached = false; jclass clazz = getCachedClass(classDotEnc, &isCached); - const bool found = (clazz != 0) || (clazz == 0 && isCached); - - if (found) + if (clazz || isCached) return clazz; const QLatin1String key(classDotEnc); diff --git a/src/corelib/kernel/qjniobject.cpp b/src/corelib/kernel/qjniobject.cpp index 43840052ae..f141c2d84e 100644 --- a/src/corelib/kernel/qjniobject.cpp +++ b/src/corelib/kernel/qjniobject.cpp @@ -467,9 +467,7 @@ jclass QtAndroidPrivate::findClass(const char *className, JNIEnv *env) bool isCached = false; jclass clazz = getCachedClass(classDotEnc, &isCached); - const bool found = clazz || (!clazz && isCached); - - if (found) + if (clazz || isCached) return clazz; const QLatin1String key(classDotEnc); |