diff options
author | Kevin Funk <kevin.funk.ford@kdab.com> | 2017-03-24 00:06:35 +0100 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-03-29 12:26:35 +0000 |
commit | db62ceedd2650e877c8f84a639cd1f64e1815832 (patch) | |
tree | 2b5abc55511e1028acf7e171794cb588979b40ec /examples | |
parent | 4b65644d0f76773e9e2702d5737cc1c7fe9c64e6 (diff) |
Replace Q_NULLPTR -> nullptr
Skip the moc/ directory intentionally, since it contains
third-party code
Change-Id: I97105e475c109231e001dc4525b3096a06601868
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'examples')
8 files changed, 8 insertions, 8 deletions
diff --git a/examples/remoteobjects/cppclient/main.cpp b/examples/remoteobjects/cppclient/main.cpp index 516eba4..b7c11d1 100644 --- a/examples/remoteobjects/cppclient/main.cpp +++ b/examples/remoteobjects/cppclient/main.cpp @@ -39,7 +39,7 @@ class tester : public QObject { Q_OBJECT public: - tester() : QObject(Q_NULLPTR) + tester() : QObject(nullptr) { QRemoteObjectNode m_client(QUrl(QStringLiteral("local:registry"))); ptr1.reset(m_client.acquire< MinuteTimerReplica >()); diff --git a/examples/remoteobjects/plugins/plugin.cpp b/examples/remoteobjects/plugins/plugin.cpp index a6f8c3b..5d4e7a9 100644 --- a/examples/remoteobjects/plugins/plugin.cpp +++ b/examples/remoteobjects/plugins/plugin.cpp @@ -56,7 +56,7 @@ class TimeModel : public QObject Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged) public: - TimeModel(QObject *parent=0) : QObject(parent), d_ptr(Q_NULLPTR) + TimeModel(QObject *parent = nullptr) : QObject(parent), d_ptr(nullptr) { d_ptr.reset(m_client.acquire< MinuteTimerReplica >()); connect(d_ptr.data(), SIGNAL(hourChanged()), this, SIGNAL(timeChanged())); diff --git a/examples/remoteobjects/server/timemodel.h b/examples/remoteobjects/server/timemodel.h index dcfd9d3..181261d 100644 --- a/examples/remoteobjects/server/timemodel.h +++ b/examples/remoteobjects/server/timemodel.h @@ -38,7 +38,7 @@ class MinuteTimer : public MinuteTimerSimpleSource { Q_OBJECT public: - MinuteTimer(QObject *parent=Q_NULLPTR); + MinuteTimer(QObject *parent = nullptr); virtual ~MinuteTimer(); public slots: diff --git a/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp b/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp index d528f05..e1b76d0 100644 --- a/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp +++ b/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp @@ -35,7 +35,7 @@ // constructor Client::Client(QSharedPointer<SimpleSwitchReplica> ptr) : - QObject(Q_NULLPTR), reptr(ptr) + QObject(nullptr), reptr(ptr) { //connect signal for replica initialized with initialization slot initConnections(); diff --git a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp index 629e7e4..8094f8a 100644 --- a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp +++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp @@ -36,7 +36,7 @@ // constructor DynamicClient::DynamicClient(QSharedPointer<QRemoteObjectDynamicReplica> ptr) : - QObject(Q_NULLPTR), reptr(ptr) + QObject(nullptr), reptr(ptr) { //connect signal for replica valid changed with signal slot initialization QObject::connect(reptr.data(), SIGNAL(initialized()), this, SLOT(initConnection_slot())); diff --git a/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h index 916a09d..173913a 100644 --- a/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h +++ b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h @@ -40,7 +40,7 @@ class SimpleSwitch : public SimpleSwitchSimpleSource { Q_OBJECT public: - SimpleSwitch(QObject *parent=Q_NULLPTR); + SimpleSwitch(QObject *parent = nullptr); ~SimpleSwitch(); virtual void server_slot(bool clientState); public Q_SLOTS: diff --git a/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp b/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp index 629e7e4..8094f8a 100644 --- a/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp +++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp @@ -36,7 +36,7 @@ // constructor DynamicClient::DynamicClient(QSharedPointer<QRemoteObjectDynamicReplica> ptr) : - QObject(Q_NULLPTR), reptr(ptr) + QObject(nullptr), reptr(ptr) { //connect signal for replica valid changed with signal slot initialization QObject::connect(reptr.data(), SIGNAL(initialized()), this, SLOT(initConnection_slot())); diff --git a/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h index 916a09d..173913a 100644 --- a/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h +++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h @@ -40,7 +40,7 @@ class SimpleSwitch : public SimpleSwitchSimpleSource { Q_OBJECT public: - SimpleSwitch(QObject *parent=Q_NULLPTR); + SimpleSwitch(QObject *parent = nullptr); ~SimpleSwitch(); virtual void server_slot(bool clientState); public Q_SLOTS: |