diff options
| author |   Renaud G <renaud@rolisteam.org> | 2016-01-10 17:55:32 +0100 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2016-01-10 17:55:32 +0100 |
| commit | 7df15a3d41d87bbed9155a5cff2fda70acbf2f0e (patch) | |
| tree | 12acda80f00901f06ec72e77a2ac3aab9e03f9b2 /node/scalaroperatornode.cpp | |
| parent | 20812f196cfba490952d2e148b4e321c10cbad7e (diff) | |
| parent | db15e41502743d1124062eddb8d2bb3617e2593c (diff) | |
| download | OneRoll-7df15a3d41d87bbed9155a5cff2fda70acbf2f0e.tar.gz OneRoll-7df15a3d41d87bbed9155a5cff2fda70acbf2f0e.zip | |
merge MergeOp into master
Diffstat (limited to 'node/scalaroperatornode.cpp')
| -rw-r--r-- | node/scalaroperatornode.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp index f69cb01..67fda8d 100644 --- a/node/scalaroperatornode.cpp +++ b/node/scalaroperatornode.cpp @@ -109,7 +109,6 @@ bool ScalarOperatorNode::setOperatorChar(QChar c) return false; } - void ScalarOperatorNode::setInternalNode(ExecutionNode* node) { m_internalNode = node; @@ -118,12 +117,10 @@ qint64 ScalarOperatorNode::add(qint64 a,qint64 b) { return a+b; } - qint64 ScalarOperatorNode::substract(qint64 a,qint64 b) { return a-b; } - qreal ScalarOperatorNode::divide(qint64 a,qint64 b) { if(b==0) @@ -133,7 +130,6 @@ qreal ScalarOperatorNode::divide(qint64 a,qint64 b) } return (qreal)a/b; } - qint64 ScalarOperatorNode::multiple(qint64 a,qint64 b) { return a*b; |