From 9b2839b6f09177bda6b3654c56a750f84173123a Mon Sep 17 00:00:00 2001
From: rguezennec <renaud@rolisteam.org>
Date: Thu, 27 Apr 2017 18:17:03 +0200
Subject: -management of arithmetic operator for scalar result of dice.

---
 node/scalaroperatornode.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'node/scalaroperatornode.h')

diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h
index 4b21b8c..0855a4c 100644
--- a/node/scalaroperatornode.h
+++ b/node/scalaroperatornode.h
@@ -27,6 +27,7 @@
 
 #include "executionnode.h"
 #include "result/scalarresult.h"
+#include "die.h"
 
 
 /**
@@ -38,7 +39,7 @@ public:
     /**
      * @brief The ArithmeticOperator enum
      */
-    enum ArithmeticOperator {PLUS,MINUS,DIVIDE,MULTIPLICATION};
+    //enum ArithmeticOperator {PLUS,MINUS,DIVIDE,MULTIPLICATION};
     /**
      * @brief ScalarOperatorNode
      */
@@ -81,12 +82,12 @@ public:
      * @brief getArithmeticOperator
      * @return
      */
-    ScalarOperatorNode::ArithmeticOperator getArithmeticOperator() const;
+    Die::ArithmeticOperator getArithmeticOperator() const;
     /**
      * @brief setArithmeticOperator
      * @param arithmeticOperator
      */
-    void setArithmeticOperator(const ScalarOperatorNode::ArithmeticOperator &arithmeticOperator);
+    void setArithmeticOperator(const Die::ArithmeticOperator &arithmeticOperator);
 
     /**
      * @brief getCopy
@@ -118,7 +119,7 @@ private:
 private:
     ExecutionNode* m_internalNode;
     ScalarResult* m_scalarResult;
-    ArithmeticOperator m_arithmeticOperator;
+    Die::ArithmeticOperator m_arithmeticOperator;
 };
 
 #endif // SCALAROPERATORNODE_H
-- 
cgit v1.2.3-70-g09d2