diff options
Diffstat (limited to 'tests/auto/corelib/kernel')
8 files changed, 62 insertions, 58 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index 8b3d0503df..3b87f8fabf 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -824,13 +824,13 @@ class JobObject : public QObject Q_OBJECT public: - explicit JobObject(QEventLoop *loop, QObject *parent = 0) + explicit JobObject(QEventLoop *loop, QObject *parent = nullptr) : QObject(parent), locker(loop) { QTimer::singleShot(1000, this, SLOT(timeout())); } - explicit JobObject(QObject *parent = 0) + explicit JobObject(QObject *parent = nullptr) : QObject(parent) { QTimer::singleShot(1000, this, SLOT(timeout())); @@ -860,7 +860,7 @@ class QuitTester : public QObject { Q_OBJECT public: - QuitTester(QObject *parent = 0) + QuitTester(QObject *parent = nullptr) : QObject(parent) { QTimer::singleShot(0, this, SLOT(doTest())); diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index 3765b6fbf8..9d1153fe47 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -86,7 +86,7 @@ void EventLoopThread::run() emit checkPoint(); (void) eventLoop->exec(); delete eventLoop; - eventLoop = 0; + eventLoop = nullptr; } class MultipleExecThread : public QThread @@ -126,7 +126,7 @@ public: class StartStopEvent: public QEvent { public: - explicit StartStopEvent(int type, QEventLoop *loop = 0) + explicit StartStopEvent(int type, QEventLoop *loop = nullptr) : QEvent(Type(type)), el(loop) { } @@ -602,12 +602,12 @@ class JobObject : public QObject Q_OBJECT public: - explicit JobObject(QEventLoop *loop, QObject *parent = 0) + explicit JobObject(QEventLoop *loop, QObject *parent = nullptr) : QObject(parent), locker(loop) { } - explicit JobObject(QObject *parent = 0) + explicit JobObject(QObject *parent = nullptr) : QObject(parent) { } diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp index fde1255443..c073e2d77f 100644 --- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp @@ -90,7 +90,7 @@ namespace MyNamespace { MyFlags myFlags() const { return m_flags; } void setMyFlags(MyFlags val) { m_flags = val; } - MyClass(QObject *parent = 0) + MyClass(QObject *parent = nullptr) : QObject(parent), m_enum(MyEnum1), m_flags(MyFlag1|MyFlag2) @@ -139,7 +139,7 @@ namespace MyNamespace { MyFlags myFlags() const { return m_flags; } void setMyFlags(MyFlags val) { m_flags = val; } - MyClass2(QObject *parent = 0) + MyClass2(QObject *parent = nullptr) : QObject(parent), m_enum(MyEnum1), m_flags(MyFlag1|MyFlag2) @@ -699,24 +699,24 @@ void tst_QMetaObject::invokeMetaMember() QCOMPARE(exp, QString("yessir")); QCOMPARE(obj.slotResult, QString("sl1:bubu")); - QObject *ptr = 0; + QObject *ptr = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl11", Q_RETURN_ARG(QObject*,ptr))); QCOMPARE(ptr, (QObject *)&obj); QCOMPARE(obj.slotResult, QString("sl11")); // try again with a space: - ptr = 0; + ptr = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl11", Q_RETURN_ARG(QObject * , ptr))); QCOMPARE(ptr, (QObject *)&obj); QCOMPARE(obj.slotResult, QString("sl11")); - const char *ptr2 = 0; + const char *ptr2 = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl12", Q_RETURN_ARG(const char*, ptr2))); - QVERIFY(ptr2 != 0); + QVERIFY(ptr2 != nullptr); QCOMPARE(obj.slotResult, QString("sl12")); // try again with a space: - ptr2 = 0; + ptr2 = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl12", Q_RETURN_ARG(char const * , ptr2))); - QVERIFY(ptr2 != 0); + QVERIFY(ptr2 != nullptr); QCOMPARE(obj.slotResult, QString("sl12")); // test w/ template args @@ -1022,12 +1022,12 @@ void tst_QMetaObject::invokeBlockingQueuedMetaMember() QCOMPARE(exp, QString("yessir")); QCOMPARE(obj.slotResult, QString("sl1:bubu")); - QObject *ptr = 0; + QObject *ptr = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl11", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QObject*,ptr))); QCOMPARE(ptr, (QObject *)&obj); QCOMPARE(obj.slotResult, QString("sl11")); // try again with a space: - ptr = 0; + ptr = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl11", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QObject * , ptr))); QCOMPARE(ptr, (QObject *)&obj); QCOMPARE(obj.slotResult, QString("sl11")); @@ -1218,7 +1218,7 @@ class ConstructibleClass : public QObject { Q_OBJECT public: - Q_INVOKABLE ConstructibleClass(QObject *parent = 0) + Q_INVOKABLE ConstructibleClass(QObject *parent = nullptr) : QObject(parent) {} }; diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 333c7931d9..2a26f5c4c2 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -1350,7 +1350,7 @@ private: //Q_PROPERTY(int intProp READ intProp WRITE setIntProp NOTIFY intPropChanged) public: - TestObject(QObject *parent = 0); // Q_INVOKABLE + TestObject(QObject *parent = nullptr); // Q_INVOKABLE ~TestObject(); // Property accessors diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index ca215386fb..f116684f5b 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -367,7 +367,7 @@ class CustomQObject : public QObject { Q_OBJECT public: - CustomQObject(QObject *parent = 0) + CustomQObject(QObject *parent = nullptr) : QObject(parent) { } @@ -1017,7 +1017,7 @@ class CustomObject : public QObject { Q_OBJECT public: - CustomObject(QObject *parent = 0) + CustomObject(QObject *parent = nullptr) : QObject(parent) { @@ -1031,7 +1031,7 @@ class CustomMultiInheritanceObject : public QObject, SecondBase { Q_OBJECT public: - CustomMultiInheritanceObject(QObject *parent = 0) + CustomMultiInheritanceObject(QObject *parent = nullptr) : QObject(parent) { @@ -1605,7 +1605,7 @@ class AutoMetaTypeObject : public QObject Q_PROPERTY(IntIntHash someHash READ someHash CONSTANT) Q_PROPERTY(NaturalNumber someInt READ someInt CONSTANT) public: - AutoMetaTypeObject(QObject *parent = 0) + AutoMetaTypeObject(QObject *parent = nullptr) : QObject(parent), m_int(42) { m_hash.insert(4, 2); @@ -1630,7 +1630,7 @@ class MyObject : public QObject { Q_OBJECT public: - MyObject(QObject *parent = 0) + MyObject(QObject *parent = nullptr) : QObject(parent) { } @@ -1781,7 +1781,7 @@ void tst_QMetaType::automaticTemplateRegistration() { typedef std::map<int, CustomObject*> StdMapIntCustomObject ; StdMapIntCustomObject intComparableMap; - CustomObject *o = 0; + CustomObject *o = nullptr; intComparableMap[4] = o; QCOMPARE(QVariant::fromValue(intComparableMap).value<StdMapIntCustomObject >()[4], o); } @@ -1822,7 +1822,7 @@ void tst_QMetaType::automaticTemplateRegistration() } { typedef std::pair<int, CustomQObject*> StdIntComparablePair; - CustomQObject* o = 0; + CustomQObject *o = nullptr; StdIntComparablePair intComparablePair = std::make_pair(4, o); QCOMPARE(QVariant::fromValue(intComparablePair).value<StdIntComparablePair>().first, 4); QCOMPARE(QVariant::fromValue(intComparablePair).value<StdIntComparablePair>().second, o); @@ -2099,7 +2099,7 @@ class MyQObjectFromGadget : public QObject, public MyGadget { Q_OBJECT public: - MyQObjectFromGadget(QObject *parent = 0) + MyQObjectFromGadget(QObject *parent = nullptr) : QObject(parent) {} }; diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 51df41f5ac..f4c028c83e 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -537,7 +537,7 @@ void tst_QObject::findChildren() Q_SET_OBJECT_NAME(t121); emptyname.setObjectName(""); - QObject *op = 0; + QObject *op = nullptr; op = o.findChild<QObject*>("o1"); QCOMPARE(op, &o1); @@ -1430,7 +1430,7 @@ class QCustomTypeChecker: public QObject Q_OBJECT public: - QCustomTypeChecker(QObject *parent = 0): QObject(parent) {} + QCustomTypeChecker(QObject *parent = nullptr): QObject(parent) {} void doEmit(CustomType ct) { emit signal1(ct); } @@ -1638,8 +1638,8 @@ void tst_QObject::thread() QCOMPARE(child.thread(), object.thread()); } - QObject *object = 0; - QObject *child = 0; + QObject *object = nullptr; + QObject *child = nullptr; { TestThread thr; @@ -1681,12 +1681,12 @@ class MoveToThreadObject : public QObject { Q_OBJECT public: - QThread *timerEventThread; - QThread *customEventThread; - QThread *slotThread; + QThread *timerEventThread = nullptr; + QThread *customEventThread = nullptr; + QThread *slotThread = nullptr; - MoveToThreadObject(QObject *parent = 0) - : QObject(parent), timerEventThread(0), customEventThread(0), slotThread(0) + MoveToThreadObject(QObject *parent = nullptr) + : QObject(parent) { } void customEvent(QEvent *) override @@ -1969,7 +1969,7 @@ void tst_QObject::property() QCOMPARE(property.type(), QVariant::UserType); QCOMPARE(property.userType(), qMetaTypeId<CustomType*>()); - CustomType *customPointer = 0; + CustomType *customPointer = nullptr; QVariant customVariant = object.property("custom"); customPointer = qvariant_cast<CustomType *>(customVariant); QCOMPARE(customPointer, object.custom()); @@ -2166,7 +2166,7 @@ public: SuperObject() { - theSender = 0; + theSender = nullptr; theSignalId = 0; } @@ -2230,7 +2230,7 @@ void tst_QObject::senderTest() QCOMPARE(receiver->sender(), (QObject *)0); QCOMPARE(receiver->senderSignalIndex(), -1); - receiver->theSender = 0; + receiver->theSender = nullptr; receiver->theSignalId = -1; thread.start(); emit sender->theSignal(); @@ -3046,7 +3046,7 @@ class EventSpy : public QObject public: typedef QList<QPair<QObject *, QEvent::Type> > EventList; - EventSpy(QObject *parent = 0) + EventSpy(QObject *parent = nullptr) : QObject(parent) { } @@ -3582,9 +3582,9 @@ class OverloadObject : public QObject signals: void sig(int i, char c, qreal m = 12); void sig(int i, int j = 12); - void sig(QObject *o, QObject *p, QObject *q = 0, QObject *r = 0) const; + void sig(QObject *o, QObject *p, QObject *q = nullptr, QObject *r = nullptr) const; void other(int a = 0); - void sig(QObject *o, OverloadObject *p = 0, QObject *q = 0, QObject *r = nullptr); + void sig(QObject *o, OverloadObject *p = nullptr, QObject *q = nullptr, QObject *r = nullptr); void sig(double r = 0.5); public slots: void slo(int i, int j = 43) @@ -6160,7 +6160,7 @@ public slots: { if (abouttoblock) { abouttoblock->deleteLater(); - abouttoblock = 0; + abouttoblock = nullptr; } ++m_aboutToBlocks; } @@ -6168,7 +6168,7 @@ public slots: { if (awake) { awake->deleteLater(); - awake = 0; + awake = nullptr; } ++m_awakes; diff --git a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp index ba973910a7..63e2f25d1d 100644 --- a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp +++ b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp @@ -98,7 +98,7 @@ void tst_QPointer::assignment_operators() QCOMPARE(p1, QPointer<QObject>(p2)); // Test assignment with a null pointer - p1 = 0; + p1 = nullptr; p2 = p1; QCOMPARE(p1, QPointer<QObject>(0)); QCOMPARE(p2, QPointer<QObject>(0)); @@ -131,9 +131,9 @@ void tst_QPointer::equality_operators() QVERIFY(p1 == p2); - QObject *object = 0; + QObject *object = nullptr; #ifndef QT_NO_WIDGETS - QWidget *widget = 0; + QWidget *widget = nullptr; #endif p1 = object; @@ -149,11 +149,15 @@ void tst_QPointer::equality_operators() QVERIFY(p1 == p2); // compare to zero - p1 = 0; + p1 = nullptr; QVERIFY(p1 == 0); QVERIFY(0 == p1); QVERIFY(p2 != 0); QVERIFY(0 != p2); + QVERIFY(p1 == nullptr); + QVERIFY(nullptr == p1); + QVERIFY(p2 != nullptr); + QVERIFY(nullptr != p2); QVERIFY(p1 == object); QVERIFY(object == p1); QVERIFY(p2 != object); @@ -188,7 +192,7 @@ void tst_QPointer::isNull() QVERIFY(p1.isNull()); p1 = this; QVERIFY(!p1.isNull()); - p1 = 0; + p1 = nullptr; QVERIFY(p1.isNull()); } diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index ea8f26ae20..251bb803b4 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -64,7 +64,7 @@ class tst_QVariant : public QObject Q_OBJECT public: - tst_QVariant(QObject *parent = 0) + tst_QVariant(QObject *parent = nullptr) : QObject(parent), customNonQObjectPointer(0) { @@ -2288,7 +2288,7 @@ void tst_QVariant::variantHash() class CustomQObject : public QObject { Q_OBJECT public: - CustomQObject(QObject *parent = 0) : QObject(parent) {} + CustomQObject(QObject *parent = nullptr) : QObject(parent) {} }; Q_DECLARE_METATYPE(CustomQObject*) @@ -2346,7 +2346,7 @@ void tst_QVariant::qvariant_cast_QObject() QVERIFY(data.canConvert<QObject*>()); QVERIFY(data.canConvert(QMetaType::QObjectStar)); QVERIFY(data.canConvert(::qMetaTypeId<QObject*>())); - QCOMPARE(data.value<QObject*>() == 0, isNull); + QCOMPARE(data.value<QObject*>() == nullptr, isNull); QVERIFY(data.convert(QMetaType::QObjectStar)); QCOMPARE(data.userType(), int(QMetaType::QObjectStar)); } else { @@ -2362,14 +2362,14 @@ void tst_QVariant::qvariant_cast_QObject() class CustomQObjectDerived : public CustomQObject { Q_OBJECT public: - CustomQObjectDerived(QObject *parent = 0) : CustomQObject(parent) {} + CustomQObjectDerived(QObject *parent = nullptr) : CustomQObject(parent) {} }; Q_DECLARE_METATYPE(CustomQObjectDerived*) class CustomQObjectDerivedNoMetaType : public CustomQObject { Q_OBJECT public: - CustomQObjectDerivedNoMetaType(QObject *parent = 0) : CustomQObject(parent) {} + CustomQObjectDerivedNoMetaType(QObject *parent = nullptr) : CustomQObject(parent) {} }; void tst_QVariant::qvariant_cast_QObject_derived() @@ -2404,7 +2404,7 @@ void tst_QVariant::qvariant_cast_QObject_derived() struct QObjectWrapper { - explicit QObjectWrapper(QObject *o = 0) : obj(o) {} + explicit QObjectWrapper(QObject *o = nullptr) : obj(o) {} QObject* getObject() const { return obj; @@ -2433,7 +2433,7 @@ class SmartPointer T* pointer; public: typedef T element_type; - explicit SmartPointer(T *t = 0) + explicit SmartPointer(T *t = nullptr) : pointer(t) { } @@ -2667,7 +2667,7 @@ void tst_QVariant::voidStar() const v2 = QVariant::fromValue(p2); QCOMPARE(v1, v2); - p2 = 0; + p2 = nullptr; v2 = QVariant::fromValue(p2); QVERIFY(v1 != v2); } @@ -3705,7 +3705,7 @@ Q_DECLARE_METATYPE(Forward*) void tst_QVariant::forwardDeclare() { - Forward *f = 0; + Forward *f = nullptr; QVariant v = QVariant::fromValue(f); QCOMPARE(qvariant_cast<Forward*>(v), f); } |