diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-21 10:41:54 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-26 07:13:18 +0000 |
| commit | 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch) | |
| tree | 206c90d47387f8322b68f5e3db613189397e1af3 /src/imports/statemachine | |
| parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (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 'src/imports/statemachine')
| -rw-r--r-- | src/imports/statemachine/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/statemachine/signaltransition.cpp | 4 | ||||
| -rw-r--r-- | src/imports/statemachine/state.cpp | 2 | ||||
| -rw-r--r-- | src/imports/statemachine/statemachine.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/statemachine/plugin.cpp b/src/imports/statemachine/plugin.cpp index 7308df8964..1357743126 100644 --- a/src/imports/statemachine/plugin.cpp +++ b/src/imports/statemachine/plugin.cpp @@ -62,7 +62,7 @@ class QtQmlStateMachinePlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QtQmlStateMachinePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QtQmlStateMachinePlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) override { qmlRegisterType<State>(uri, 1, 0, "State"); diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp index 3c3142cce8..63a969c0e8 100644 --- a/src/imports/statemachine/signaltransition.cpp +++ b/src/imports/statemachine/signaltransition.cpp @@ -163,7 +163,7 @@ void SignalTransition::connectTriggered() QObject *target = senderObject(); QQmlData *ddata = QQmlData::get(this); - QQmlContextData *ctxtdata = ddata ? ddata->outerContext : 0; + QQmlContextData *ctxtdata = ddata ? ddata->outerContext : nullptr; Q_ASSERT(m_bindings.count() == 1); const QV4::CompiledData::Binding *binding = m_bindings.at(0); @@ -178,7 +178,7 @@ void SignalTransition::connectTriggered() QQmlBoundSignalExpression *expression = ctxtdata ? new QQmlBoundSignalExpression(target, signalIndex, - ctxtdata, this, m_compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex]) : 0; + ctxtdata, this, m_compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex]) : nullptr; if (expression) expression->setNotifyOnValueChanged(false); m_signalExpression = expression; diff --git a/src/imports/statemachine/state.cpp b/src/imports/statemachine/state.cpp index 2467039d01..af76087256 100644 --- a/src/imports/statemachine/state.cpp +++ b/src/imports/statemachine/state.cpp @@ -50,7 +50,7 @@ State::State(QState *parent) void State::componentComplete() { - if (this->machine() == NULL) { + if (this->machine() == nullptr) { static bool once = false; if (!once) { once = true; diff --git a/src/imports/statemachine/statemachine.cpp b/src/imports/statemachine/statemachine.cpp index 7c8dcbc6b6..ca6c59b6ac 100644 --- a/src/imports/statemachine/statemachine.cpp +++ b/src/imports/statemachine/statemachine.cpp @@ -68,7 +68,7 @@ void StateMachine::setRunning(bool running) void StateMachine::componentComplete() { - if (QStateMachine::initialState() == NULL && childMode() == QState::ExclusiveStates) + if (QStateMachine::initialState() == nullptr && childMode() == QState::ExclusiveStates) qmlWarning(this) << "No initial state set for StateMachine"; // Everything is proper setup, now start the state-machine if we got |