aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlnotifier
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /tests/auto/qml/qqmlnotifier
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff)
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>
Diffstat (limited to 'tests/auto/qml/qqmlnotifier')
-rw-r--r--tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
index 88a5d41975..381ae98195 100644
--- a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
+++ b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
@@ -142,7 +142,7 @@ class tst_qqmlnotifier : public QQmlDataTest
Q_OBJECT
public:
tst_qqmlnotifier()
- : root(0), exportedClass(0), exportedObject(0)
+ : root(nullptr), exportedClass(nullptr), exportedObject(nullptr)
{}
private slots:
@@ -180,28 +180,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 +303,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();
}