diff options
| author |   Renaud G <renaud@rolisteam.org> | 2014-12-09 22:08:56 +0100 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2014-12-09 22:08:56 +0100 |
| commit | bf1a7ffc6f9e989cae1e34f8bb6ba826dd98d88e (patch) | |
| tree | 28ff366db40cb00006274cc3517fe2e40338f195 | |
| parent | 49713207e5972ad36b8cd1013a464734a06d8364 (diff) | |
| download | OneRoll-bf1a7ffc6f9e989cae1e34f8bb6ba826dd98d88e.tar.gz OneRoll-bf1a7ffc6f9e989cae1e34f8bb6ba826dd98d88e.zip | |
Usage of the new API for Result
| -rw-r--r-- | node/dicerollernode.cpp | 2 | ||||
| -rw-r--r-- | node/scalaroperatornode.cpp | 12 | ||||
| -rw-r--r-- | node/scalaroperatornode.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/node/dicerollernode.cpp b/node/dicerollernode.cpp index 27750df..8e86cce 100644 --- a/node/dicerollernode.cpp +++ b/node/dicerollernode.cpp @@ -47,7 +47,7 @@ void DiceRollerNode::run(ExecutionNode* previous) Result* result=previous->getResult(); if(NULL!=result) { - m_diceCount = result->getScalar(); + m_diceCount = result->getResult(Result::SCALAR).toReal(); m_result->setPrevious(result); for(quint64 i=0; i < m_diceCount ; ++i) diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp index 97d17d9..fb7a110 100644 --- a/node/scalaroperatornode.cpp +++ b/node/scalaroperatornode.cpp @@ -5,7 +5,7 @@ ScalarOperatorNode::ScalarOperatorNode() - : m_internalNode(NULL),m_myScalarResult(new ScalarResult()) + : m_internalNode(NULL),m_scalarResult(new ScalarResult()) { m_scalarOperationList.insert('+',PLUS); m_scalarOperationList.insert('-',MINUS); @@ -13,7 +13,7 @@ ScalarOperatorNode::ScalarOperatorNode() m_scalarOperationList.insert('*',MULTIPLICATION); m_scalarOperationList.insert('/',DIVIDE); - m_result = m_myScalarResult; + m_result = m_scalarResult; } void ScalarOperatorNode::run(ExecutionNode* previous) @@ -42,16 +42,16 @@ void ScalarOperatorNode::run(ExecutionNode* previous) switch(m_myOperator) { case PLUS: - m_myScalarResult->setValue(add(previousResult->getScalar(),internalResult->getScalar())); + m_scalarResult->setValue(add(previousResult->getResult(Result::SCALAR).toReal(),internalResult->getResult(Result::SCALAR).toReal())); break; case MINUS: - m_myScalarResult->setValue(substract(previousResult->getScalar(),internalResult->getScalar())); + m_scalarResult->setValue(substract(previousResult->getResult(Result::SCALAR).toReal(),internalResult->getResult(Result::SCALAR).toReal())); break; case MULTIPLICATION: - m_myScalarResult->setValue(multiple(previousResult->getScalar(),internalResult->getScalar())); + m_scalarResult->setValue(multiple(previousResult->getResult(Result::SCALAR).toReal(),internalResult->getResult(Result::SCALAR).toReal())); break; case DIVIDE: - m_myScalarResult->setValue(divide(previousResult->getScalar(),internalResult->getScalar())); + m_scalarResult->setValue(divide(previousResult->getResult(Result::SCALAR).toReal(),internalResult->getResult(Result::SCALAR).toReal())); break; default: break; diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h index 2cd8405..14f759b 100644 --- a/node/scalaroperatornode.h +++ b/node/scalaroperatornode.h @@ -30,7 +30,7 @@ private: ScalarOperator m_myOperator; ExecutionNode* m_internalNode; QMap<QChar,ScalarOperator> m_scalarOperationList; - ScalarResult* m_myScalarResult; + ScalarResult* m_scalarResult; }; #endif // SCALAROPERATORNODE_H |