From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 11:49:52 +0200 Subject: Replace Q_NULLPTR with nullptr where possible Remaining uses of Q_NULLPTR are in: src/corelib/global/qcompilerdetection.h (definition and documentation of Q_NULLPTR) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a Reviewed-by: Ville Voutilainen Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/corelib/kernel/qjnihelpers.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/corelib/kernel/qjnihelpers.cpp') diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index 02c58858ff..c7109a6506 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -64,14 +64,14 @@ namespace QtAndroidPrivate { KeyEventListener::~KeyEventListener() {} } -static JavaVM *g_javaVM = Q_NULLPTR; -static jobject g_jActivity = Q_NULLPTR; -static jobject g_jService = Q_NULLPTR; -static jobject g_jClassLoader = Q_NULLPTR; +static JavaVM *g_javaVM = nullptr; +static jobject g_jActivity = nullptr; +static jobject g_jService = nullptr; +static jobject g_jClassLoader = nullptr; static jint g_androidSdkVersion = 0; -static jclass g_jNativeClass = Q_NULLPTR; -static jmethodID g_runPendingCppRunnablesMethodID = Q_NULLPTR; -static jmethodID g_hideSplashScreenMethodID = Q_NULLPTR; +static jclass g_jNativeClass = nullptr; +static jmethodID g_runPendingCppRunnablesMethodID = nullptr; +static jmethodID g_hideSplashScreenMethodID = nullptr; Q_GLOBAL_STATIC(std::deque, g_pendingRunnables); static QBasicMutex g_pendingRunnablesMutex; -- cgit v1.2.3