diff options
Diffstat (limited to 'src/plugins/platforms/android')
5 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index 4d263831e1..8d9a968b4f 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -98,7 +98,7 @@ namespace QtAndroidAccessibility QAccessibleInterface *interfaceFromId(jint objectId) { - QAccessibleInterface *iface = 0; + QAccessibleInterface *iface = nullptr; if (objectId == -1) { QWindow *win = qApp->focusWindow(); if (win) @@ -164,7 +164,7 @@ namespace QtAndroidAccessibility QPoint pos = QHighDpi::fromNativePixels(QPoint(int(x), int(y)), root->window()); QAccessibleInterface *child = root->childAt(pos.x(), pos.y()); - QAccessibleInterface *lastChild = 0; + QAccessibleInterface *lastChild = nullptr; while (child && (child != lastChild)) { lastChild = child; child = child->childAt(pos.x(), pos.y()); diff --git a/src/plugins/platforms/android/androidjnimain.h b/src/plugins/platforms/android/androidjnimain.h index 63be5910f9..6902f89341 100644 --- a/src/plugins/platforms/android/androidjnimain.h +++ b/src/plugins/platforms/android/androidjnimain.h @@ -96,9 +96,9 @@ namespace QtAndroid }; void setSystemUiVisibility(SystemUiVisibility uiVisibility); - jobject createBitmap(QImage img, JNIEnv *env = 0); + jobject createBitmap(QImage img, JNIEnv *env = nullptr); jobject createBitmap(int width, int height, QImage::Format format, JNIEnv *env); - jobject createBitmapDrawable(jobject bitmap, JNIEnv *env = 0); + jobject createBitmapDrawable(jobject bitmap, JNIEnv *env = nullptr); const char *classErrorMsgFmt(); const char *methodErrorMsgFmt(); diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp index de2fdaa0e2..fe5de1f882 100644 --- a/src/plugins/platforms/android/androidjnimenu.cpp +++ b/src/plugins/platforms/android/androidjnimenu.cpp @@ -59,12 +59,12 @@ using namespace QtAndroid; namespace QtAndroidMenu { static QList<QAndroidPlatformMenu *> pendingContextMenus; - static QAndroidPlatformMenu *visibleMenu = 0; + static QAndroidPlatformMenu *visibleMenu = nullptr; static QRecursiveMutex visibleMenuMutex; static QSet<QAndroidPlatformMenuBar *> menuBars; - static QAndroidPlatformMenuBar *visibleMenuBar = 0; - static QWindow *activeTopLevelWindow = 0; + static QAndroidPlatformMenuBar *visibleMenuBar = nullptr; + static QWindow *activeTopLevelWindow = nullptr; static QRecursiveMutex menuBarMutex; static jmethodID openContextMenuMethodID = 0; diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h index 85d4cee6cb..8a29ed7e7e 100644 --- a/src/plugins/platforms/android/qandroideventdispatcher.h +++ b/src/plugins/platforms/android/qandroideventdispatcher.h @@ -48,7 +48,7 @@ class QAndroidEventDispatcher : public QUnixEventDispatcherQPA { Q_OBJECT public: - explicit QAndroidEventDispatcher(QObject *parent = 0); + explicit QAndroidEventDispatcher(QObject *parent = nullptr); ~QAndroidEventDispatcher(); void start(); void stop(); diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index 5add7b0746..fc71b391c0 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -91,7 +91,7 @@ private: } // namespace anonymous -static QAndroidInputContext *m_androidInputContext = 0; +static QAndroidInputContext *m_androidInputContext = nullptr; static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt/android/QtNativeInputConnection"; static char const *const QtExtractedTextClassName = "org/qtproject/qt/android/QtExtractedText"; static jclass m_extractedTextClass = 0; |