diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-04-08 21:34:02 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-04-08 21:34:02 +0200 |
| commit | 5cfe48265ebad0ffa0a980dbc2d131fceeecdf3b (patch) | |
| tree | 0d8d654046e18ad90a7a06e00e0e56c375a230fd /node/scalaroperatornode.cpp | |
| parent | 9192ba51a362715061cce1104b5543f7e93bf70f (diff) | |
| download | OneRoll-5cfe48265ebad0ffa0a980dbc2d131fceeecdf3b.tar.gz OneRoll-5cfe48265ebad0ffa0a980dbc2d131fceeecdf3b.zip | |
-remove memory leaks
-delete created objects
Diffstat (limited to 'node/scalaroperatornode.cpp')
| -rw-r--r-- | node/scalaroperatornode.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp index 95fd077..34eb6b8 100644 --- a/node/scalaroperatornode.cpp +++ b/node/scalaroperatornode.cpp @@ -15,6 +15,14 @@ ScalarOperatorNode::ScalarOperatorNode() m_result = m_scalarResult; } +ScalarOperatorNode::~ScalarOperatorNode() +{ + if(NULL!=m_internalNode) + { + delete m_internalNode; + m_internalNode = NULL; + } +} void ScalarOperatorNode::run(ExecutionNode* previous) { @@ -43,7 +51,7 @@ void ScalarOperatorNode::run(ExecutionNode* previous) m_internalNode->getResult()->setPrevious(previousResult); } - switch(m_myOperator) + switch(m_operator) { case PLUS: m_scalarResult->setValue(add(previousResult->getResult(Result::SCALAR).toReal(),internalResult->getResult(Result::SCALAR).toReal())); @@ -74,7 +82,7 @@ bool ScalarOperatorNode::setOperatorChar(QChar c) { if(m_scalarOperationList.contains(c)) { - m_myOperator = m_scalarOperationList.value(c); + m_operator = m_scalarOperationList.value(c); return true; } return false; @@ -110,10 +118,14 @@ QString ScalarOperatorNode::toString() const } qint64 ScalarOperatorNode::getPriority() const { - if((m_myOperator==PLUS)||(m_myOperator==MINUS)) + if((m_operator==PLUS)||(m_operator==MINUS)) + { return 1; + } else + { return 2; + } } void ScalarOperatorNode::generateDotTree(QString& s) { |