1 files changed, 22 insertions, 28 deletions

diff --git a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
index 88a5d41975..8811f779bb 100644
--- a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
+++ b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
@@ -46,21 +46,17 @@ class ExportedClass : public QObject
     Q_PROPERTY(int v4BindingProp2 READ v4BindingProp2 NOTIFY v4BindingProp2Changed)
     Q_PROPERTY(int scriptBindingProp READ scriptBindingProp NOTIFY scriptBindingPropChanged)
 public:
-    int qmlObjectPropConnections;
-    int cppObjectPropConnections;
-    int unboundPropConnections;
-    int v8BindingPropConnections;
-    int v4BindingPropConnections;
-    int v4BindingProp2Connections;
-    int scriptBindingPropConnections;
-    int boundSignalConnections;
-    int unusedSignalConnections;
-
-    ExportedClass()
-        : qmlObjectPropConnections(0), cppObjectPropConnections(0), unboundPropConnections(0),
-          v8BindingPropConnections(0), v4BindingPropConnections(0), v4BindingProp2Connections(0),
-          scriptBindingPropConnections(0), boundSignalConnections(0), unusedSignalConnections(0)
-    {}
+    int qmlObjectPropConnections = 0;
+    int cppObjectPropConnections = 0;
+    int unboundPropConnections = 0;
+    int v8BindingPropConnections = 0;
+    int v4BindingPropConnections = 0;
+    int v4BindingProp2Connections = 0;
+    int scriptBindingPropConnections = 0;
+    int boundSignalConnections = 0;
+    int unusedSignalConnections = 0;
+
+    ExportedClass() {}
 
     ~ExportedClass()
     {
@@ -141,9 +137,7 @@ class tst_qqmlnotifier : public QQmlDataTest
 {
     Q_OBJECT
 public:
-    tst_qqmlnotifier()
-        : root(0), exportedClass(0), exportedObject(0)
-    {}
+    tst_qqmlnotifier() {}
 
 private slots:
     void initTestCase() override;
@@ -166,9 +160,9 @@ private:
     void createObjects();
 
     QQmlEngine engine;
-    QObject *root;
-    ExportedClass *exportedClass;
-    ExportedClass *exportedObject;
+    QObject *root = nullptr;
+    ExportedClass *exportedClass = nullptr;
+    ExportedClass *exportedObject = nullptr;
 };
 
 void tst_qqmlnotifier::initTestCase()
@@ -180,28 +174,28 @@ void tst_qqmlnotifier::initTestCase()
 void tst_qqmlnotifier::createObjects()
 {
     delete root;
-    root = 0;
-    exportedClass = exportedObject = 0;
+    root = nullptr;
+    exportedClass = exportedObject = nullptr;
 
     QQmlComponent component(&engine, testFileUrl("connectnotify.qml"));
     exportedObject = new ExportedClass();
     exportedObject->setObjectName("exportedObject");
     engine.rootContext()->setContextProperty("_exportedObject", exportedObject);
     root = component.create();
-    QVERIFY(root != 0);
+    QVERIFY(root != nullptr);
 
     exportedClass = qobject_cast<ExportedClass *>(
                 root->findChild<ExportedClass*>("exportedClass"));
-    QVERIFY(exportedClass != 0);
+    QVERIFY(exportedClass != nullptr);
     exportedClass->verifyReceiverCount();
 }
 
 void tst_qqmlnotifier::cleanupTestCase()
 {
     delete root;
-    root = 0;
+    root = nullptr;
     delete exportedObject;
-    exportedObject = 0;
+    exportedObject = nullptr;
 }
 
 void tst_qqmlnotifier::testConnectNotify()
@@ -303,7 +297,7 @@ void tst_qqmlnotifier::disconnectOnDestroy()
     // Deleting a QML object should remove all connections. For exportedClass, this is tested in
     // the destructor, and for exportedObject, it is tested below.
     delete root;
-    root = 0;
+    root = nullptr;
     QCOMPARE(exportedObject->cppObjectPropConnections, 0);
     exportedObject->verifyReceiverCount();
 }