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/listsetrollnode.cpp | |
| parent | a543a6ca8ddc2826a4433044ed1a040acbbf36a3 (diff) | |
| download | OneRoll-f053853e87624a045438bacd4dd1494e91ae381f.tar.gz OneRoll-f053853e87624a045438bacd4dd1494e91ae381f.zip | |
-c++11 update about for and nullptr.
Diffstat (limited to 'node/listsetrollnode.cpp')
| -rw-r--r-- | node/listsetrollnode.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/node/listsetrollnode.cpp b/node/listsetrollnode.cpp index 488721a..8f86332 100644 --- a/node/listsetrollnode.cpp +++ b/node/listsetrollnode.cpp @@ -28,10 +28,10 @@ ListSetRollNode::ListSetRollNode() } ListSetRollNode::~ListSetRollNode() { - if(NULL!=m_diceResult) + if(nullptr!=m_diceResult) { delete m_diceResult; - m_diceResult =NULL; + m_diceResult =nullptr; } } @@ -59,10 +59,10 @@ qint64 ListSetRollNode::getPriority() const void ListSetRollNode::run(ExecutionNode* previous) { m_previousNode = previous; - if(NULL!=previous) + if(nullptr!=previous) { Result* result=previous->getResult(); - if(NULL!=result) + if(nullptr!=result) { quint64 diceCount = result->getResult(Result::SCALAR).toReal(); m_result->setPrevious(result); @@ -76,7 +76,7 @@ void ListSetRollNode::run(ExecutionNode* previous) getValueFromDie(die,rollResult); } m_stringResult->setText(rollResult.join(",")); - if(NULL!=m_nextNode) + if(nullptr!=m_nextNode) { m_nextNode->run(this); } @@ -106,7 +106,7 @@ void ListSetRollNode::computeFacesNumber(Die* die) Q_ASSERT(m_values.size() == m_rangeList.size()); qint64 max; int i=0; - foreach(Range range, m_rangeList) + for(Range range: m_rangeList) { if(((i==0)||(max<range.getEnd()))&&(range.isFullyDefined())) { @@ -133,7 +133,7 @@ void ListSetRollNode::getValueFromDie(Die* die,QStringList& rollResult) { Q_ASSERT(m_values.size() == m_rangeList.size()); int i=0; - foreach (Range range, m_rangeList) + for (Range range: m_rangeList) { if(range.hasValid(die,false)) { @@ -150,7 +150,7 @@ ExecutionNode* ListSetRollNode::getCopy() const node->setRangeList(dataList); node->setUnique(m_unique); node->setListValue(m_values); - if(NULL!=m_nextNode) + if(nullptr!=m_nextNode) { node->setNextNode(m_nextNode->getCopy()); } |