diff options
| author | 2017-11-12 16:28:40 +0100 | |
|---|---|---|
| committer | 2017-11-12 16:28:40 +0100 | |
| commit | 2a8fd91924799e713c79f8a8e7d9edc94574a6ca (patch) | |
| tree | 6af720571119ef395a39fe3f6fff5d52ce09e3cf /node/filternode.cpp | |
| parent | cedc70618afa6826d409a64078ea1a8ede4af06c (diff) | |
| parent | bbc6f032bf8f182e6e4e97c7afddf47a3fb8a911 (diff) | |
| download | OneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.tar.gz OneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.zip | |
update diceparser
Diffstat (limited to 'node/filternode.cpp')
| -rw-r--r-- | node/filternode.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/node/filternode.cpp b/node/filternode.cpp index 462774b..5153c79 100644 --- a/node/filternode.cpp +++ b/node/filternode.cpp @@ -8,7 +8,7 @@ FilterNode::FilterNode() FilterNode::~FilterNode() { - if(nullptr!=m_validator) + if(NULL!=m_validator) { delete m_validator; } @@ -20,13 +20,13 @@ void FilterNode::setValidator(Validator* validator) void FilterNode::run(ExecutionNode* previous) { m_previousNode = previous; - if(nullptr==previous) + if(NULL==previous) { return; } DiceResult* previousDiceResult = static_cast<DiceResult*>(previous->getResult()); m_result->setPrevious(previousDiceResult); - if(nullptr!=previousDiceResult) + if(NULL!=previousDiceResult) { QList<Die*> diceList=previousDiceResult->getResultList(); QList<Die*> diceList2; @@ -48,7 +48,7 @@ void FilterNode::run(ExecutionNode* previous) } m_diceResult->setResultList(diceList2); - if(nullptr!=m_nextNode) + if(NULL!=m_nextNode) { m_nextNode->run(this); } @@ -69,7 +69,7 @@ QString FilterNode::toString(bool wl) const qint64 FilterNode::getPriority() const { qint64 priority=0; - if(nullptr!=m_nextNode) + if(nullptr!=m_previousNode) { priority = m_nextNode->getPriority(); } @@ -80,11 +80,11 @@ qint64 FilterNode::getPriority() const ExecutionNode* FilterNode::getCopy() const { FilterNode* node = new FilterNode(); - if(nullptr!=m_validator) + if(NULL!=m_validator) { node->setValidator(m_validator->getCopy()); } - if(nullptr!=m_nextNode) + if(NULL!=m_nextNode) { node->setNextNode(m_nextNode->getCopy()); } |