merge MergeOp into master

2 files changed, 3 insertions, 7 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;
diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h
index ea0f7e1..ca6f3ac 100644
--- a/node/scalaroperatornode.h
+++ b/node/scalaroperatornode.h
@@ -53,10 +53,10 @@ public:
     virtual QMap<ExecutionNode::ERROR_CODE,QString> getExecutionErrorMap();
 
 private:
-    qint64 add(qint64,qint64);
-    qint64 substract(qint64,qint64);
+    static qint64 add(qint64,qint64);
+    static qint64 substract(qint64,qint64);
     qreal divide(qint64,qint64);
-    qint64 multiple(qint64,qint64);
+    static qint64 multiple(qint64,qint64);
 
 private:
 	ScalarOperator m_operator;