diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-04-30 15:00:22 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-05-02 08:27:22 +0000 |
| commit | ed298643fa3f5dd7f27a4eb6b08d786d2365e4f5 (patch) | |
| tree | 54328a007af293c343d7d7291aa0660697ee3c72 /src | |
| parent | 54dc1cebd3f78d2b2b8d8d6d486035d364405761 (diff) | |
Use nullptr instead of 0
Change-Id: I94da16599d11c4877cff4e38c9d91799737a653a
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/scxmlstatemachine/invokedservices_p.h | 4 | ||||
| -rw-r--r-- | src/imports/scxmlstatemachine/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/scxmlstatemachine/statemachineloader_p.h | 2 | ||||
| -rw-r--r-- | src/scxml/qscxmlexecutablecontent.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/scxmlstatemachine/invokedservices_p.h b/src/imports/scxmlstatemachine/invokedservices_p.h index 72d6f2a..5a6dac7 100644 --- a/src/imports/scxmlstatemachine/invokedservices_p.h +++ b/src/imports/scxmlstatemachine/invokedservices_p.h @@ -67,7 +67,7 @@ class QScxmlInvokedServices : public QObject, public QQmlParserStatus Q_INTERFACES(QQmlParserStatus) Q_CLASSINFO("DefaultProperty", "qmlChildren") public: - QScxmlInvokedServices(QObject *parent = 0); + QScxmlInvokedServices(QObject *parent = nullptr); QVariantMap children(); QScxmlStateMachine *stateMachine() const; @@ -83,7 +83,7 @@ private: void classBegin() override; void componentComplete() override; - QScxmlStateMachine *m_stateMachine = 0; + QScxmlStateMachine *m_stateMachine = nullptr; QList<QObject *> m_qmlChildren; }; diff --git a/src/imports/scxmlstatemachine/plugin.cpp b/src/imports/scxmlstatemachine/plugin.cpp index b9f4748..35d5668 100644 --- a/src/imports/scxmlstatemachine/plugin.cpp +++ b/src/imports/scxmlstatemachine/plugin.cpp @@ -54,7 +54,7 @@ class QScxmlStateMachinePlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QScxmlStateMachinePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } + QScxmlStateMachinePlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) { // @uri QtScxml diff --git a/src/imports/scxmlstatemachine/statemachineloader_p.h b/src/imports/scxmlstatemachine/statemachineloader_p.h index a4ee3f1..14688fc 100644 --- a/src/imports/scxmlstatemachine/statemachineloader_p.h +++ b/src/imports/scxmlstatemachine/statemachineloader_p.h @@ -67,7 +67,7 @@ class QScxmlStateMachineLoader: public QObject public: - explicit QScxmlStateMachineLoader(QObject *parent = 0); + explicit QScxmlStateMachineLoader(QObject *parent = nullptr); QScxmlStateMachine *stateMachine() const; diff --git a/src/scxml/qscxmlexecutablecontent.cpp b/src/scxml/qscxmlexecutablecontent.cpp index ea5f528..206809c 100644 --- a/src/scxml/qscxmlexecutablecontent.cpp +++ b/src/scxml/qscxmlexecutablecontent.cpp @@ -234,7 +234,7 @@ using namespace QScxmlExecutableContent; #ifndef BUILD_QSCXMLC -static int parseTime(const QString &t, bool *ok = 0) +static int parseTime(const QString &t, bool *ok = nullptr) { if (t.isEmpty()) { if (ok) |