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.

---
 parsingtoolbox.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'parsingtoolbox.cpp')

diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index e04dcbe..3ff7e21 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -31,7 +31,7 @@ ParsingToolBox::ParsingToolBox()
     : m_logicOp(new QMap<QString,BooleanCondition::LogicOperator>()),
       m_logicOperation(new QMap<QString,CompositeValidator::LogicOperation>()),
       m_conditionOperation(new QMap<QString,OperationCondition::ConditionOperator>()),
-      m_arithmeticOperation(new QHash<QString,ScalarOperatorNode::ArithmeticOperator>())
+      m_arithmeticOperation(new QHash<QString,Die::ArithmeticOperator>())
 {
     //m_logicOp = ;
     m_logicOp->insert(">=",BooleanCondition::GreaterOrEqual);
@@ -52,12 +52,12 @@ ParsingToolBox::ParsingToolBox()
 
 
     //m_arithmeticOperation = new QHash<QString,ScalarOperatorNode::ArithmeticOperator>();
-    m_arithmeticOperation->insert(QStringLiteral("+"),ScalarOperatorNode::PLUS);
-    m_arithmeticOperation->insert(QStringLiteral("-"),ScalarOperatorNode::MINUS);
-    m_arithmeticOperation->insert(QStringLiteral("*"),ScalarOperatorNode::MULTIPLICATION);
-    m_arithmeticOperation->insert(QStringLiteral("x"),ScalarOperatorNode::MULTIPLICATION);
-    m_arithmeticOperation->insert(QStringLiteral("/"),ScalarOperatorNode::DIVIDE);
-    m_arithmeticOperation->insert(QStringLiteral("÷"),ScalarOperatorNode::DIVIDE);
+    m_arithmeticOperation->insert(QStringLiteral("+"),Die::PLUS);
+    m_arithmeticOperation->insert(QStringLiteral("-"),Die::MINUS);
+    m_arithmeticOperation->insert(QStringLiteral("*"),Die::MULTIPLICATION);
+    m_arithmeticOperation->insert(QStringLiteral("x"),Die::MULTIPLICATION);
+    m_arithmeticOperation->insert(QStringLiteral("/"),Die::DIVIDE);
+    m_arithmeticOperation->insert(QStringLiteral("÷"),Die::DIVIDE);
 
 }
 
@@ -103,7 +103,7 @@ bool ParsingToolBox::readDiceLogicOperator(QString& str,OperationCondition::Cond
     return false;
 }
 
-bool ParsingToolBox::readArithmeticOperator(QString &str, ScalarOperatorNode::ArithmeticOperator &op)
+bool ParsingToolBox::readArithmeticOperator(QString &str, Die::ArithmeticOperator &op)
 {
     bool found = false;
     //QHash<QString,ScalarOperatorNode::ArithmeticOperator>::Iterator
-- 
cgit v1.2.3-70-g09d2