diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-03-26 10:48:49 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-30 09:24:01 +0000 |
| commit | 68ed06b17b180ba7486b25cd6dd0f12b11cdb57f (patch) | |
| tree | eb71117c1997d15a7b38f9ab7962f5b4dfe628bb /src/corelib/kernel/qjnienvironment.cpp | |
| parent | f82b504ef4ca8242e708c5dc84f5893204353fac (diff) | |
Rename QJniEnvironment exceptionCheckAndClear to checkAndClearExceptions
Address feedback from header view.
Task-number: QTBUG-90211
Change-Id: Iad2b609598b16f66fd6ab09484fe6e6899981263
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit b9f27335e7462a15ac642841bb6d86ebebb349f9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/kernel/qjnienvironment.cpp')
| -rw-r--r-- | src/corelib/kernel/qjnienvironment.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/kernel/qjnienvironment.cpp b/src/corelib/kernel/qjnienvironment.cpp index ddadc2e114..0c9aa27e82 100644 --- a/src/corelib/kernel/qjnienvironment.cpp +++ b/src/corelib/kernel/qjnienvironment.cpp @@ -128,11 +128,11 @@ QJniEnvironment::QJniEnvironment() \fn QJniEnvironment::~QJniEnvironment() Detaches the current thread from the Java VM and destroys the QJniEnvironment object. - This will clear any pending exception by calling exceptionCheckAndClear(). + This will clear any pending exception by calling checkAndClearExceptions(). */ QJniEnvironment::~QJniEnvironment() { - exceptionCheckAndClear(); + checkAndClearExceptions(); } /*! @@ -229,7 +229,7 @@ bool QJniEnvironment::registerNativeMethods(const char *className, JNINativeMeth jclass clazz = d->jniEnv->GetObjectClass(classObject.object()); if (d->jniEnv->RegisterNatives(clazz, methods, size) < 0) { - exceptionCheckAndClear(); + checkAndClearExceptions(); d->jniEnv->DeleteLocalRef(clazz); return false; } @@ -248,7 +248,7 @@ bool QJniEnvironment::registerNativeMethods(const char *className, JNINativeMeth */ /*! - \fn QJniEnvironment::exceptionCheckAndClear(OutputMode outputMode = OutputMode::Verbose) + \fn QJniEnvironment::checkAndClearExceptions(OutputMode outputMode = OutputMode::Verbose) Cleans any pending exceptions either silently or reporting stack backtrace, depending on the \a outputMode. @@ -260,7 +260,7 @@ bool QJniEnvironment::registerNativeMethods(const char *className, JNINativeMeth \return \c true when a pending exception was cleared. */ -bool QJniEnvironment::exceptionCheckAndClear(QJniEnvironment::OutputMode outputMode) +bool QJniEnvironment::checkAndClearExceptions(QJniEnvironment::OutputMode outputMode) { if (Q_UNLIKELY(d->jniEnv->ExceptionCheck())) { if (outputMode != OutputMode::Silent) @@ -274,7 +274,7 @@ bool QJniEnvironment::exceptionCheckAndClear(QJniEnvironment::OutputMode outputM } /*! - \fn QJniEnvironment::exceptionCheckAndClear(JNIEnv *env, OutputMode outputMode = OutputMode::Verbose) + \fn QJniEnvironment::checkAndClearExceptions(JNIEnv *env, OutputMode outputMode = OutputMode::Verbose) Cleans any pending exceptions for \a env, either silently or reporting stack backtrace, depending on the \a outputMode. This is useful when you @@ -287,7 +287,7 @@ bool QJniEnvironment::exceptionCheckAndClear(QJniEnvironment::OutputMode outputM \return \c true when a pending exception was cleared. */ -bool QJniEnvironment::exceptionCheckAndClear(JNIEnv *env, QJniEnvironment::OutputMode outputMode) +bool QJniEnvironment::checkAndClearExceptions(JNIEnv *env, QJniEnvironment::OutputMode outputMode) { if (Q_UNLIKELY(env->ExceptionCheck())) { if (outputMode != OutputMode::Silent) |