diff options
| author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:55:01 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-27 08:38:38 +0000 |
| commit | c5c6aba3b07a44726da96cd2acaed05e67fe3ff8 (patch) | |
| tree | c66bf2bd56898e27be055fab9dd511793f97fcc1 /src/scxml/qscxmltabledata.cpp | |
| parent | 45c751bb6045cc0edb5e850f8cb001c8c88651a9 (diff) | |
Replace Q_NULLPTR with nullptr
Change-Id: I6bee476e2f467b57ee8e4bba1e780cf79c7a460e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/scxml/qscxmltabledata.cpp')
| -rw-r--r-- | src/scxml/qscxmltabledata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scxml/qscxmltabledata.cpp b/src/scxml/qscxmltabledata.cpp index 23ead19..aa9a35e 100644 --- a/src/scxml/qscxmltabledata.cpp +++ b/src/scxml/qscxmltabledata.cpp @@ -667,7 +667,7 @@ protected: { SequenceInfo info = m_activeSequences.back(); m_activeSequences.pop_back(); - m_instructions.setSequenceInfo(m_activeSequences.isEmpty() ? Q_NULLPTR : + m_instructions.setSequenceInfo(m_activeSequences.isEmpty() ? nullptr : &m_activeSequences.last()); auto sequence = m_instructions.at<InstructionSequence>(info.location); @@ -896,7 +896,7 @@ private: public: InstructionStorage(QVector<qint32> &storage) : m_instr(storage) - , m_info(Q_NULLPTR) + , m_info(nullptr) {} ContainerId newContainerId() const { return m_instr.size(); } |