diff options
| author |   rguezennec <renaud@rolisteam.org> | 2017-04-27 18:17:03 +0200 |
|---|---|---|
| committer | rguezennec <renaud@rolisteam.org> | 2017-04-27 18:17:03 +0200 |
| commit | 9b2839b6f09177bda6b3654c56a750f84173123a (patch) | |
| tree | 259cbab92ad580b11ddd4a01bd8fa53b151a237c /parsingtoolbox.cpp | |
| parent | 026ca5cb4829cd4c4ad6b945e27479303e96fe82 (diff) | |
| download | OneRoll-9b2839b6f09177bda6b3654c56a750f84173123a.tar.gz OneRoll-9b2839b6f09177bda6b3654c56a750f84173123a.zip | |
-management of arithmetic operator for scalar result of dice.
Diffstat (limited to 'parsingtoolbox.cpp')
| -rw-r--r-- | parsingtoolbox.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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 |