diff options
| author | 2017-11-11 18:51:13 +0100 | |
|---|---|---|
| committer | 2017-11-11 18:51:13 +0100 | |
| commit | cedc70618afa6826d409a64078ea1a8ede4af06c (patch) | |
| tree | 3082249db90f6eebe7b23b226c5c688e7f4648a5 /node/rerolldicenode.cpp | |
| parent | f329a8e39beb732b5685eb01476221b461cc50d1 (diff) | |
| download | OneRoll-cedc70618afa6826d409a64078ea1a8ede4af06c.tar.gz OneRoll-cedc70618afa6826d409a64078ea1a8ede4af06c.zip | |
-replace NULL to nullptr.
Diffstat (limited to 'node/rerolldicenode.cpp')
| -rw-r--r-- | node/rerolldicenode.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/node/rerolldicenode.cpp b/node/rerolldicenode.cpp index dcce4aa..1f8cd7e 100644 --- a/node/rerolldicenode.cpp +++ b/node/rerolldicenode.cpp @@ -2,26 +2,26 @@ RerollDiceNode::RerollDiceNode() - : m_diceResult(new DiceResult()),m_adding(false),m_validator(NULL) + : m_diceResult(new DiceResult()),m_adding(false),m_validator(nullptr) { m_result=m_diceResult; } RerollDiceNode::~RerollDiceNode() { - if(NULL!=m_validator) + if(nullptr!=m_validator) { delete m_validator; - m_validator = NULL; + m_validator = nullptr; } } void RerollDiceNode::run(ExecutionNode* previous) { m_previousNode = previous; - if((NULL!=previous)&&(NULL!=previous->getResult())) + if((nullptr!=previous)&&(nullptr!=previous->getResult())) { DiceResult* previous_result = static_cast<DiceResult*>(previous->getResult()); m_result->setPrevious(previous_result); - if(NULL!=previous_result) + if(nullptr!=previous_result) { foreach(Die* die,previous_result->getResultList()) { @@ -42,7 +42,7 @@ void RerollDiceNode::run(ExecutionNode* previous) } } - if(NULL!=m_nextNode) + if(nullptr!=m_nextNode) { m_nextNode->run(this); } @@ -72,7 +72,7 @@ void RerollDiceNode::setAddingMode(bool b) qint64 RerollDiceNode::getPriority() const { qint64 priority=0; - if(NULL!=m_nextNode) + if(nullptr!=m_nextNode) { priority = m_nextNode->getPriority(); } @@ -85,7 +85,7 @@ ExecutionNode* RerollDiceNode::getCopy() const RerollDiceNode* node = new RerollDiceNode(); node->setValidator(m_validator); node->setAddingMode(m_adding); - if(NULL!=m_nextNode) + if(nullptr!=m_nextNode) { node->setNextNode(m_nextNode->getCopy()); } |