From 564b59d903683b14c75b72a3e93367717f201def Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 7 Oct 2020 13:05:48 +0200 Subject: Another round of replacing 0 with nullptr This time based on grepping to also include documentation, tests and examples previously missed by the automatic tool. Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f Reviewed-by: Qt CI Bot Reviewed-by: Friedemann Kleint --- tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp | 2 +- tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp | 2 +- tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h | 8 ++++---- tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/auto/dbus') diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp index 1ea476e580..3e79fb77f4 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp +++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp @@ -46,7 +46,7 @@ class MyServer : public QDBusServer, protected QDBusContext Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.qmyserver") public: - MyServer(QObject* parent = 0) + MyServer(QObject* parent = nullptr) : QDBusServer(parent), m_conn("none"), obj(NULL) diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp index e92f173fae..7f098aeb36 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp +++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp @@ -39,7 +39,7 @@ class PingerServer : public QDBusServer, protected QDBusContext Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.qpinger") public: - PingerServer(QObject* parent = 0) + PingerServer(QObject *parent = nullptr) : QDBusServer(parent), m_conn("none") { diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h index af42224b79..14a7243cf0 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h @@ -39,7 +39,7 @@ class BaseObject: public QObject Q_OBJECT Q_CLASSINFO("D-Bus Interface", "local.BaseObject") public: - BaseObject(QObject *parent = 0) : QObject(parent) { } + BaseObject(QObject *parent = nullptr) : QObject(parent) { } public slots: void anotherMethod() { } }; @@ -53,7 +53,7 @@ public slots: public: static QString path; int callCount; - MyObject(QObject *parent = 0) : BaseObject(parent), callCount(0) {} + MyObject(QObject *parent = nullptr) : BaseObject(parent), callCount(0) {} }; class MyObjectWithoutInterface: public QObject @@ -66,7 +66,7 @@ public: static QString path; static QString interface; int callCount; - MyObjectWithoutInterface(QObject *parent = 0) : QObject(parent), callCount(0) {} + MyObjectWithoutInterface(QObject *parent = nullptr) : QObject(parent), callCount(0) {} }; class SignalReceiver : public QObject @@ -238,7 +238,7 @@ class TestObject : public QObject { Q_OBJECT public: - TestObject(QObject *parent = 0) : QObject(parent) {} + TestObject(QObject *parent = nullptr) : QObject(parent) {} ~TestObject() {} QString func; diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp index 535d2f756b..53eb9585f8 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp +++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp @@ -44,7 +44,7 @@ class MyServer : public QDBusServer, protected QDBusContext Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.qmyserver") public: - MyServer(QObject* parent = 0) + MyServer(QObject *parent = nullptr) : QDBusServer(parent), m_conn("none") { -- cgit v1.2.3