diff options
| author |   Renaud G <renaud@rolisteam.org> | 2017-10-27 22:19:20 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2017-10-29 03:30:46 +0100 |
| commit | f053853e87624a045438bacd4dd1494e91ae381f (patch) | |
| tree | cbf98ae65d48f4158c3af73be6bd0a1fb9417335 /node/rerolldicenode.cpp | |
| parent | a543a6ca8ddc2826a4433044ed1a040acbbf36a3 (diff) | |
| download | OneRoll-f053853e87624a045438bacd4dd1494e91ae381f.tar.gz OneRoll-f053853e87624a045438bacd4dd1494e91ae381f.zip | |
-c++11 update about for and nullptr.
Diffstat (limited to 'node/rerolldicenode.cpp')
| -rw-r--r-- | node/rerolldicenode.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/node/rerolldicenode.cpp b/node/rerolldicenode.cpp index dcce4aa..8e8be2c 100644 --- a/node/rerolldicenode.cpp +++ b/node/rerolldicenode.cpp @@ -2,28 +2,28 @@ 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()) + for(Die* die : previous_result->getResultList()) { Die* tmpdie = new Die(); *tmpdie=*die; @@ -34,7 +34,7 @@ void RerollDiceNode::run(ExecutionNode* previous) QList<Die*> list = m_diceResult->getResultList(); - foreach(Die* die, list) + for(Die* die: list) { if(m_validator->hasValid(die,false)) { @@ -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()); } |