use nullptr consistently (clang-tidy)

From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.

Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).

Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 103 insertions, 103 deletions

diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 84a87f63a7..65c9c9e8ad 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -300,7 +300,7 @@ void tst_qquicktextinput::cleanup()
 {
     // ensure not even skipped tests with custom input context leave it dangling
     QInputMethodPrivate *inputMethodPrivate = QInputMethodPrivate::get(qApp->inputMethod());
-    inputMethodPrivate->testContext = 0;
+    inputMethodPrivate->testContext = nullptr;
 }
 
 tst_qquicktextinput::tst_qquicktextinput()
@@ -332,7 +332,7 @@ void tst_qquicktextinput::text()
         textinputComponent.setData("import QtQuick 2.0\nTextInput {  text: \"\"  }", QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->text(), QString(""));
         QCOMPARE(textinputObject->length(), 0);
 
@@ -346,7 +346,7 @@ void tst_qquicktextinput::text()
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->text(), standard.at(i));
         QCOMPARE(textinputObject->length(), standard.at(i).length());
 
@@ -363,7 +363,7 @@ void tst_qquicktextinput::width()
         textinputComponent.setData("import QtQuick 2.0\nTextInput {  text: \"\" }", QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->width(), 0.0);
 
         delete textinputObject;
@@ -401,7 +401,7 @@ void tst_qquicktextinput::width()
 
         qreal metricWidth = ceil(layout.boundingRect().width());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         int delta = abs(int(int(textinputObject->width()) - metricWidth));
         QVERIFY(delta <= 3.0); // As best as we can hope for cross-platform.
 
@@ -418,7 +418,7 @@ void tst_qquicktextinput::font()
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->font().pointSize(), 40);
         QCOMPARE(textinputObject->font().bold(), false);
         QCOMPARE(textinputObject->font().italic(), false);
@@ -432,7 +432,7 @@ void tst_qquicktextinput::font()
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->font().bold(), true);
         QCOMPARE(textinputObject->font().italic(), false);
 
@@ -445,7 +445,7 @@ void tst_qquicktextinput::font()
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->font().italic(), true);
         QCOMPARE(textinputObject->font().bold(), false);
 
@@ -458,7 +458,7 @@ void tst_qquicktextinput::font()
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->font().family(), QString("Helvetica"));
         QCOMPARE(textinputObject->font().bold(), false);
         QCOMPARE(textinputObject->font().italic(), false);
@@ -472,7 +472,7 @@ void tst_qquicktextinput::font()
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->font().family(), QString(""));
 
         delete textinputObject;
@@ -539,7 +539,7 @@ void tst_qquicktextinput::color()
         QQmlComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->color(), QColor(colorStrings.at(i)));
 
         delete textinputObject;
@@ -552,7 +552,7 @@ void tst_qquicktextinput::color()
         QQmlComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->selectionColor(), QColor(colorStrings.at(i)));
 
         delete textinputObject;
@@ -565,7 +565,7 @@ void tst_qquicktextinput::color()
         QQmlComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->selectedTextColor(), QColor(colorStrings.at(i)));
 
         delete textinputObject;
@@ -581,7 +581,7 @@ void tst_qquicktextinput::color()
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
 
-        QVERIFY(textinputObject != 0);
+        QVERIFY(textinputObject != nullptr);
         QCOMPARE(textinputObject->color(), testColor);
 
         delete textinputObject;
@@ -598,7 +598,7 @@ void tst_qquicktextinput::wrap()
         QQuickTextInput *textObject = qobject_cast<QQuickTextInput*>(textComponent.create());
         textHeight = textObject->height();
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->wrapMode(), QQuickTextInput::WrapAnywhere);
         QCOMPARE(textObject->width(), 300.);
 
@@ -611,7 +611,7 @@ void tst_qquicktextinput::wrap()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickTextInput *textObject = qobject_cast<QQuickTextInput*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->width(), 30.);
         QVERIFY(textObject->height() > textHeight);
 
@@ -653,7 +653,7 @@ void tst_qquicktextinput::selection()
     QQmlComponent textinputComponent(&engine);
     textinputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
-    QVERIFY(textinputObject != 0);
+    QVERIFY(textinputObject != nullptr);
 
 
     //Test selection follows cursor
@@ -793,7 +793,7 @@ void tst_qquicktextinput::overwriteMode()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QSignalSpy spy(textInput, SIGNAL(overwriteModeChanged(bool)));
 
@@ -1071,7 +1071,7 @@ void tst_qquicktextinput::moveCursorSelection()
     QQmlComponent textinputComponent(&engine);
     textinputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
-    QVERIFY(textinputObject != 0);
+    QVERIFY(textinputObject != nullptr);
 
     textinputObject->setCursorPosition(cursorPosition);
     textinputObject->moveCursorSelection(movePosition, mode);
@@ -1279,7 +1279,7 @@ void tst_qquicktextinput::moveCursorSelectionSequence()
     QQmlComponent textinputComponent(&engine);
     textinputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput*>(textinputComponent.create());
-    QVERIFY(textinputObject != 0);
+    QVERIFY(textinputObject != nullptr);
 
     textinputObject->setCursorPosition(cursorPosition);
 
@@ -1306,17 +1306,17 @@ void tst_qquicktextinput::dragMouseSelection()
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
     QQuickTextInput *textInputObject = qobject_cast<QQuickTextInput *>(window.rootObject());
-    QVERIFY(textInputObject != 0);
+    QVERIFY(textInputObject != nullptr);
 
     // press-and-drag-and-release from x1 to x2
     int x1 = 10;
     int x2 = 70;
     int y = textInputObject->height()/2;
-    QTest::mousePress(&window, Qt::LeftButton, 0, QPoint(x1,y));
+    QTest::mousePress(&window, Qt::LeftButton, Qt::NoModifier, QPoint(x1,y));
     QTest::mouseMove(&window, QPoint(x2, y));
-    QTest::mouseRelease(&window, Qt::LeftButton, 0, QPoint(x2,y));
+    QTest::mouseRelease(&window, Qt::LeftButton, Qt::NoModifier, QPoint(x2,y));
     QString str1;
     QTRY_VERIFY((str1 = textInputObject->selectedText()).length() > 3);
     QTRY_VERIFY(str1.length() > 3);
@@ -1324,9 +1324,9 @@ void tst_qquicktextinput::dragMouseSelection()
     // press and drag the current selection.
     x1 = 40;
     x2 = 100;
-    QTest::mousePress(&window, Qt::LeftButton, 0, QPoint(x1,y));
+    QTest::mousePress(&window, Qt::LeftButton, Qt::NoModifier, QPoint(x1,y));
     QTest::mouseMove(&window, QPoint(x2, y));
-    QTest::mouseRelease(&window, Qt::LeftButton, 0, QPoint(x2,y));
+    QTest::mouseRelease(&window, Qt::LeftButton, Qt::NoModifier, QPoint(x2,y));
     QString str2 = textInputObject->selectedText();
     QTRY_VERIFY(str2.length() > 3);
 
@@ -1367,9 +1367,9 @@ void tst_qquicktextinput::mouseSelectionMode()
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
     QQuickTextInput *textInputObject = qobject_cast<QQuickTextInput *>(window.rootObject());
-    QVERIFY(textInputObject != 0);
+    QVERIFY(textInputObject != nullptr);
 
     textInputObject->setFocus(focus);
     textInputObject->setFocusOnPress(focusOnPress);
@@ -1378,9 +1378,9 @@ void tst_qquicktextinput::mouseSelectionMode()
     int x1 = 10;
     int x2 = 70;
     int y = textInputObject->height()/2;
-    QTest::mousePress(&window, Qt::LeftButton, 0, QPoint(x1,y));
+    QTest::mousePress(&window, Qt::LeftButton, Qt::NoModifier, QPoint(x1,y));
     QTest::mouseMove(&window, QPoint(x2,y)); // doesn't work
-    QTest::mouseRelease(&window, Qt::LeftButton, 0, QPoint(x2,y));
+    QTest::mouseRelease(&window, Qt::LeftButton, Qt::NoModifier, QPoint(x2,y));
     if (selectWords) {
         QTRY_COMPARE(textInputObject->selectedText(), text);
     } else {
@@ -1471,7 +1471,7 @@ void tst_qquicktextinput::horizontalAlignment_RightToLeft()
 
     QQuickView window(testFileUrl("horizontalAlignment_RightToLeft.qml"));
     QQuickTextInput *textInput = window.rootObject()->findChild<QQuickTextInput*>("text");
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
     window.show();
 
     const QString rtlText = textInput->text();
@@ -1618,7 +1618,7 @@ void tst_qquicktextinput::verticalAlignment()
 {
     QQuickView window(testFileUrl("horizontalAlignment.qml"));
     QQuickTextInput *textInput = window.rootObject()->findChild<QQuickTextInput*>("text");
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
     window.showNormal();
 
     QCOMPARE(textInput->vAlign(), QQuickTextInput::AlignTop);
@@ -1805,13 +1805,13 @@ void tst_qquicktextinput::boundingRect()
 void tst_qquicktextinput::positionAt()
 {
     QQuickView window(testFileUrl("positionAt.qml"));
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
     window.show();
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
     QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput *>(window.rootObject());
-    QVERIFY(textinputObject != 0);
+    QVERIFY(textinputObject != nullptr);
 
     // Check autoscrolled...
 
@@ -1895,13 +1895,13 @@ void tst_qquicktextinput::positionAt()
 void tst_qquicktextinput::maxLength()
 {
     QQuickView window(testFileUrl("maxLength.qml"));
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
     window.show();
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
     QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput *>(window.rootObject());
-    QVERIFY(textinputObject != 0);
+    QVERIFY(textinputObject != nullptr);
     QVERIFY(textinputObject->text().isEmpty());
     QCOMPARE(textinputObject->maxLength(), 10);
     foreach (const QString &str, standard) {
@@ -1927,9 +1927,9 @@ void tst_qquicktextinput::masks()
     QQuickView window(testFileUrl("masks.qml"));
     window.show();
     window.requestActivate();
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
     QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput *>(window.rootObject());
-    QVERIFY(textinputObject != 0);
+    QVERIFY(textinputObject != nullptr);
     QTRY_VERIFY(textinputObject->hasActiveFocus());
     QCOMPARE(textinputObject->text().length(), 0);
     QCOMPARE(textinputObject->inputMask(), QString("HHHHhhhh; "));
@@ -1959,7 +1959,7 @@ void tst_qquicktextinput::validators()
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
 
     QLocale defaultLocale;
     QLocale enLocale("en");
@@ -2250,9 +2250,9 @@ void tst_qquicktextinput::inputMethods()
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
     // test input method hints
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
     QQuickTextInput *input = qobject_cast<QQuickTextInput *>(window.rootObject());
-    QVERIFY(input != 0);
+    QVERIFY(input != nullptr);
     QVERIFY(input->inputMethodHints() & Qt::ImhNoPredictiveText);
     QSignalSpy inputMethodHintSpy(input, SIGNAL(inputMethodHintsChanged()));
     input->setInputMethodHints(Qt::ImhUppercaseOnly);
@@ -2341,7 +2341,7 @@ void tst_qquicktextinput::signal_accepted()
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
 
     QQuickTextInput *input = qobject_cast<QQuickTextInput *>(qvariant_cast<QObject *>(window.rootObject()->property("input")));
     QVERIFY(input);
@@ -2383,7 +2383,7 @@ void tst_qquicktextinput::signal_editingfinished()
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
 
     QQuickTextInput *input1 = qobject_cast<QQuickTextInput *>(qvariant_cast<QObject *>(window.rootObject()->property("input1")));
     QVERIFY(input1);
@@ -2508,11 +2508,11 @@ void tst_qquicktextinput::navigation()
     window.show();
     window.requestActivate();
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
 
     QQuickTextInput *input = qobject_cast<QQuickTextInput *>(qvariant_cast<QObject *>(window.rootObject()->property("myInput")));
 
-    QVERIFY(input != 0);
+    QVERIFY(input != nullptr);
     input->setCursorPosition(0);
     QTRY_VERIFY(input->hasActiveFocus());
     simulateKey(&window, Qt::Key_Left);
@@ -2557,11 +2557,11 @@ void tst_qquicktextinput::navigation_RTL()
     window.show();
     window.requestActivate();
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
 
     QQuickTextInput *input = qobject_cast<QQuickTextInput *>(qvariant_cast<QObject *>(window.rootObject()->property("myInput")));
 
-    QVERIFY(input != 0);
+    QVERIFY(input != nullptr);
     const quint16 arabic_str[] = { 0x0638, 0x0643, 0x00646, 0x0647, 0x0633, 0x0638, 0x0643, 0x00646, 0x0647, 0x0633, 0x0647};
     input->setText(QString::fromUtf16(arabic_str, 11));
 
@@ -2598,7 +2598,7 @@ void tst_qquicktextinput::copyAndPaste()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     // copy and paste
     QCOMPARE(textInput->text().length(), 12);
@@ -2696,7 +2696,7 @@ void tst_qquicktextinput::copyAndPasteKeySequence()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QQuickWindow window;
     textInput->setParentItem(window.contentItem());
@@ -2763,7 +2763,7 @@ void tst_qquicktextinput::canPasteEmpty()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     bool cp = !textInput->isReadOnly() && QGuiApplication::clipboard()->text().length() != 0;
     QCOMPARE(textInput->canPaste(), cp);
@@ -2779,7 +2779,7 @@ void tst_qquicktextinput::canPaste()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     bool cp = !textInput->isReadOnly() && QGuiApplication::clipboard()->text().length() != 0;
     QCOMPARE(textInput->canPaste(), cp);
@@ -2798,9 +2798,9 @@ void tst_qquicktextinput::middleClickPaste()
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
     QQuickTextInput *textInputObject = qobject_cast<QQuickTextInput *>(window.rootObject());
-    QVERIFY(textInputObject != 0);
+    QVERIFY(textInputObject != nullptr);
 
     textInputObject->setFocus(true);
 
@@ -2835,7 +2835,7 @@ void tst_qquicktextinput::passwordCharacter()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     textInput->setPasswordCharacter("X");
     qreal implicitWidth = textInput->implicitWidth();
@@ -2863,7 +2863,7 @@ void tst_qquicktextinput::cursorDelegate()
     view.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&view));
     QQuickTextInput *textInputObject = view.rootObject()->findChild<QQuickTextInput*>("textInputObject");
-    QVERIFY(textInputObject != 0);
+    QVERIFY(textInputObject != nullptr);
     // Delegate is created on demand, and so won't be available immediately.  Focus in or
     // setCursorVisible(true) will trigger creation.
     QTRY_VERIFY(!textInputObject->findChild<QQuickItem*>("cursorInstance"));
@@ -2889,7 +2889,7 @@ void tst_qquicktextinput::cursorDelegate()
     textInputObject->setCursorPosition(0);
     const QPoint point1 = textInputObject->positionToRectangle(5).center().toPoint();
     QTest::qWait(400);  //ensure this isn't treated as a double-click
-    QTest::mouseClick(&view, Qt::LeftButton, 0, point1);
+    QTest::mouseClick(&view, Qt::LeftButton, Qt::NoModifier, point1);
     QTest::qWait(50);
     QTRY_VERIFY(textInputObject->cursorPosition() != 0);
     QCOMPARE(textInputObject->cursorRectangle().x(), delegateObject->x());
@@ -2899,10 +2899,10 @@ void tst_qquicktextinput::cursorDelegate()
     textInputObject->setCursorPosition(0);
     const QPoint point2 = textInputObject->positionToRectangle(10).center().toPoint();
     QTest::qWait(400);  //ensure this isn't treated as a double-click
-    QTest::mousePress(&view, Qt::LeftButton, 0, point1);
+    QTest::mousePress(&view, Qt::LeftButton, Qt::NoModifier, point1);
     QMouseEvent mv(QEvent::MouseMove, point2, Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
     QGuiApplication::sendEvent(&view, &mv);
-    QTest::mouseRelease(&view, Qt::LeftButton, 0, point2);
+    QTest::mouseRelease(&view, Qt::LeftButton, Qt::NoModifier, point2);
     QTest::qWait(50);
     QTRY_COMPARE(textInputObject->cursorRectangle().x(), delegateObject->x());
     QCOMPARE(textInputObject->cursorRectangle().y(), delegateObject->y());
@@ -2910,7 +2910,7 @@ void tst_qquicktextinput::cursorDelegate()
     textInputObject->setReadOnly(true);
     textInputObject->setCursorPosition(0);
     QTest::qWait(400);  //ensure this isn't treated as a double-click
-    QTest::mouseClick(&view, Qt::LeftButton, 0, textInputObject->positionToRectangle(5).center().toPoint());
+    QTest::mouseClick(&view, Qt::LeftButton, Qt::NoModifier, textInputObject->positionToRectangle(5).center().toPoint());
     QTest::qWait(50);
     QTRY_VERIFY(textInputObject->cursorPosition() != 0);
     QCOMPARE(textInputObject->cursorRectangle().x(), delegateObject->x());
@@ -2918,7 +2918,7 @@ void tst_qquicktextinput::cursorDelegate()
 
     textInputObject->setCursorPosition(0);
     QTest::qWait(400);  //ensure this isn't treated as a double-click
-    QTest::mouseClick(&view, Qt::LeftButton, 0, textInputObject->positionToRectangle(5).center().toPoint());
+    QTest::mouseClick(&view, Qt::LeftButton, Qt::NoModifier, textInputObject->positionToRectangle(5).center().toPoint());
     QTest::qWait(50);
     QTRY_VERIFY(textInputObject->cursorPosition() != 0);
     QCOMPARE(textInputObject->cursorRectangle().x(), delegateObject->x());
@@ -2964,7 +2964,7 @@ void tst_qquicktextinput::cursorDelegate()
     }
 
     //Test Delegate gets deleted
-    textInputObject->setCursorDelegate(0);
+    textInputObject->setCursorDelegate(nullptr);
     QVERIFY(!textInputObject->findChild<QQuickItem*>("cursorInstance"));
 }
 
@@ -2981,7 +2981,7 @@ void tst_qquicktextinput::remoteCursorDelegate()
     view.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&view));
     QQuickTextInput *textInputObject = view.rootObject()->findChild<QQuickTextInput*>("textInputObject");
-    QVERIFY(textInputObject != 0);
+    QVERIFY(textInputObject != nullptr);
 
     // Delegate is created on demand, and so won't be available immediately.  Focus in or
     // setCursorVisible(true) will trigger creation.
@@ -3307,11 +3307,11 @@ void tst_qquicktextinput::readOnly()
     window.show();
     window.requestActivate();
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
 
     QQuickTextInput *input = qobject_cast<QQuickTextInput *>(qvariant_cast<QObject *>(window.rootObject()->property("myInput")));
 
-    QVERIFY(input != 0);
+    QVERIFY(input != nullptr);
     QTRY_VERIFY(input->hasActiveFocus());
     QVERIFY(input->isReadOnly());
     QVERIFY(!input->isCursorVisible());
@@ -3337,11 +3337,11 @@ void tst_qquicktextinput::echoMode()
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
 
     QQuickTextInput *input = qobject_cast<QQuickTextInput *>(qvariant_cast<QObject *>(window.rootObject()->property("myInput")));
 
-    QVERIFY(input != 0);
+    QVERIFY(input != nullptr);
     QTRY_VERIFY(input->hasActiveFocus());
     QString initial = input->text();
     Qt::InputMethodHints ref;
@@ -3413,7 +3413,7 @@ void tst_qquicktextinput::passwordEchoDelay()
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
 
     QQuickTextInput *input = qobject_cast<QQuickTextInput *>(qvariant_cast<QObject *>(window.rootObject()->property("myInput")));
     QVERIFY(input);
@@ -3478,8 +3478,8 @@ void tst_qquicktextinput::passwordEchoDelay()
 
 void tst_qquicktextinput::simulateKey(QWindow *view, int key)
 {
-    QKeyEvent press(QKeyEvent::KeyPress, key, 0);
-    QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
+    QKeyEvent press(QKeyEvent::KeyPress, key, nullptr);
+    QKeyEvent release(QKeyEvent::KeyRelease, key, nullptr);
 
     QGuiApplication::sendEvent(view, &press);
     QGuiApplication::sendEvent(view, &release);
@@ -3500,7 +3500,7 @@ void tst_qquicktextinput::focusOnPress()
     QQmlComponent texteditComponent(&engine);
     texteditComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInputObject = qobject_cast<QQuickTextInput*>(texteditComponent.create());
-    QVERIFY(textInputObject != 0);
+    QVERIFY(textInputObject != nullptr);
     QCOMPARE(textInputObject->focusOnPress(), true);
     QCOMPARE(textInputObject->hasFocus(), false);
 
@@ -3522,7 +3522,7 @@ void tst_qquicktextinput::focusOnPress()
     QCOMPARE(textInputObject->hasFocus(), false);
     QCOMPARE(textInputObject->hasActiveFocus(), false);
 
-    Qt::KeyboardModifiers noModifiers = 0;
+    Qt::KeyboardModifiers noModifiers = Qt::NoModifier;
     QTest::mousePress(&window, Qt::LeftButton, noModifiers);
     QGuiApplication::processEvents();
     QCOMPARE(textInputObject->hasFocus(), true);
@@ -3596,7 +3596,7 @@ void tst_qquicktextinput::focusOnPressOnlyOneItem()
     //
     // this is a contrived example to be sure, but at the end of this, the
     // important thing is that only one thing should have activeFocus.
-    Qt::KeyboardModifiers noModifiers = 0;
+    Qt::KeyboardModifiers noModifiers = nullptr;
     QTest::mousePress(&window, Qt::LeftButton, noModifiers, QPoint(10, 10));
 
     // make sure the press is processed.
@@ -3631,7 +3631,7 @@ void tst_qquicktextinput::openInputPanel()
     QCOMPARE(qApp->inputMethod()->isVisible(), false);
 
     // input panel should open on focus
-    Qt::KeyboardModifiers noModifiers = 0;
+    Qt::KeyboardModifiers noModifiers = nullptr;
     QTest::mousePress(&view, Qt::LeftButton, noModifiers);
     QGuiApplication::processEvents();
     QVERIFY(input->hasActiveFocus());
@@ -3687,7 +3687,7 @@ void tst_qquicktextinput::openInputPanel()
 class MyTextInput : public QQuickTextInput
 {
 public:
-    MyTextInput(QQuickItem *parent = 0) : QQuickTextInput(parent)
+    MyTextInput(QQuickItem *parent = nullptr) : QQuickTextInput(parent)
     {
         nbPaint = 0;
     }
@@ -4232,14 +4232,14 @@ void tst_qquicktextinput::inputMethodUpdate()
 void tst_qquicktextinput::cursorRectangleSize()
 {
     QQuickView *window = new QQuickView(testFileUrl("positionAt.qml"));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput *>(window->rootObject());
 
     // make sure cursor rectangle is not at (0,0)
     textInput->setX(10);
     textInput->setY(10);
     textInput->setCursorPosition(3);
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
     textInput->setFocus(true);
     window->show();
     window->requestActivate();
@@ -4287,24 +4287,24 @@ void tst_qquicktextinput::tripleClickSelectsAll()
     // Clicking on the same point inside TextInput three times in a row
     // should trigger a triple click, thus selecting all the text.
     QPoint pointInside = input->position().toPoint() + QPoint(2,2);
-    QTest::mouseDClick(&view, Qt::LeftButton, 0, pointInside);
-    QTest::mouseClick(&view, Qt::LeftButton, 0, pointInside);
+    QTest::mouseDClick(&view, Qt::LeftButton, Qt::NoModifier, pointInside);
+    QTest::mouseClick(&view, Qt::LeftButton, Qt::NoModifier, pointInside);
     QGuiApplication::processEvents();
     QCOMPARE(input->selectedText(), hello);
 
     // Now it simulates user moving the mouse between the second and the third click.
     // In this situation, we don't expect a triple click.
     QPoint pointInsideButFar = QPoint(input->width(),input->height()) - QPoint(2,2);
-    QTest::mouseDClick(&view, Qt::LeftButton, 0, pointInside);
-    QTest::mouseClick(&view, Qt::LeftButton, 0, pointInsideButFar);
+    QTest::mouseDClick(&view, Qt::LeftButton, Qt::NoModifier, pointInside);
+    QTest::mouseClick(&view, Qt::LeftButton, Qt::NoModifier, pointInsideButFar);
     QGuiApplication::processEvents();
     QVERIFY(input->selectedText().isEmpty());
 
     // And now we press the third click too late, so no triple click event is triggered.
-    QTest::mouseDClick(&view, Qt::LeftButton, 0, pointInside);
+    QTest::mouseDClick(&view, Qt::LeftButton, Qt::NoModifier, pointInside);
     QGuiApplication::processEvents();
     QTest::qWait(qApp->styleHints()->mouseDoubleClickInterval() + 1);
-    QTest::mouseClick(&view, Qt::LeftButton, 0, pointInside);
+    QTest::mouseClick(&view, Qt::LeftButton, Qt::NoModifier, pointInside);
     QGuiApplication::processEvents();
     QVERIFY(input->selectedText().isEmpty());
 }
@@ -4374,7 +4374,7 @@ void tst_qquicktextinput::getText()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QCOMPARE(textInput->getText(start, end), expectedText);
 }
@@ -4714,7 +4714,7 @@ void tst_qquicktextinput::insert()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     textInput->select(selectionStart, selectionEnd);
 
@@ -5069,7 +5069,7 @@ void tst_qquicktextinput::remove()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     textInput->select(selectionStart, selectionEnd);
 
@@ -5264,7 +5264,7 @@ void tst_qquicktextinput::keySequence()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
     textInput->setEchoMode(echoMode);
 
     QQuickWindow window;
@@ -5426,7 +5426,7 @@ void tst_qquicktextinput::undo()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QQuickWindow window;
     textInput->setParentItem(window.contentItem());
@@ -5512,7 +5512,7 @@ void tst_qquicktextinput::redo()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QQuickWindow window;
     textInput->setParentItem(window.contentItem());
@@ -5844,7 +5844,7 @@ void tst_qquicktextinput::undo_keypressevents()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QQuickWindow window;
     textInput->setParentItem(window.contentItem());
@@ -5868,7 +5868,7 @@ void tst_qquicktextinput::clear()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QQuickWindow window;
     textInput->setParentItem(window.contentItem());
@@ -5922,7 +5922,7 @@ void tst_qquicktextinput::backspaceSurrogatePairs()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
     textInput->setText(text);
     textInput->setCursorPosition(text.length());
 
@@ -5957,7 +5957,7 @@ void tst_qquicktextinput::QTBUG_19956()
     window.show();
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
     QQuickTextInput *input = qobject_cast<QQuickTextInput*>(window.rootObject());
     QVERIFY(input);
     input->setFocus(true);
@@ -5996,7 +5996,7 @@ void tst_qquicktextinput::QTBUG_19956_regexp()
     window.show();
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
     QQuickTextInput *input = qobject_cast<QQuickTextInput*>(window.rootObject());
     QVERIFY(input);
     input->setFocus(true);
@@ -6181,7 +6181,7 @@ void tst_qquicktextinput::keypress_inputMask_withValidator()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QQuickWindow window;
     textInput->setParentItem(window.contentItem());
@@ -6411,7 +6411,7 @@ void tst_qquicktextinput::setInputMask()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     // then either insert using insert() or keyboard
     if (insert_text) {
@@ -6468,7 +6468,7 @@ void tst_qquicktextinput::inputMask()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QCOMPARE(textInput->inputMask(), expectedMask);
 }
@@ -6479,7 +6479,7 @@ void tst_qquicktextinput::clearInputMask()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QVERIFY(!textInput->inputMask().isEmpty());
     textInput->setInputMask(QString());
@@ -6551,7 +6551,7 @@ void tst_qquicktextinput::keypress_inputMask()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QQuickWindow window;
     textInput->setParentItem(window.contentItem());
@@ -6574,7 +6574,7 @@ void tst_qquicktextinput::keypress_inputMethod_inputMask()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     QQuickWindow window;
     textInput->setParentItem(window.contentItem());
@@ -6639,7 +6639,7 @@ void tst_qquicktextinput::hasAcceptableInputMask()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     // test that invalid input (for required) work for optionalMask
     textInput->setText(invalid);
@@ -6693,7 +6693,7 @@ void tst_qquicktextinput::maskCharacter()
     QQmlComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create());
-    QVERIFY(textInput != 0);
+    QVERIFY(textInput != nullptr);
 
     for (int i = 0; i < input.size(); ++i) {
         QString in = QString(input.at(i));
@@ -6706,7 +6706,7 @@ void tst_qquicktextinput::maskCharacter()
 class TestValidator : public QValidator
 {
 public:
-    TestValidator(QObject *parent = 0) : QValidator(parent) { }
+    TestValidator(QObject *parent = nullptr) : QValidator(parent) { }
 
     State validate(QString &input, int &) const { return input == QStringLiteral("ok") ? Acceptable : Intermediate; }
     void fixup(QString &input) const { input = QStringLiteral("ok"); }
@@ -6926,7 +6926,7 @@ void tst_qquicktextinput::padding()
     QQuickItem *root = window->rootObject();
     QVERIFY(root);
     QQuickTextInput *obj = qobject_cast<QQuickTextInput*>(root);
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
 
     qreal cw = obj->contentWidth();
     qreal ch = obj->contentHeight();