diff options
| author |   Renaud G <renaud@rolisteam.org> | 2017-11-12 16:28:40 +0100 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2017-11-12 16:28:40 +0100 |
| commit | 2a8fd91924799e713c79f8a8e7d9edc94574a6ca (patch) | |
| tree | 6af720571119ef395a39fe3f6fff5d52ce09e3cf /parsingtoolbox.cpp | |
| parent | cedc70618afa6826d409a64078ea1a8ede4af06c (diff) | |
| parent | bbc6f032bf8f182e6e4e97c7afddf47a3fb8a911 (diff) | |
| download | OneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.tar.gz OneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.zip | |
update diceparser
Diffstat (limited to 'parsingtoolbox.cpp')
| -rw-r--r-- | parsingtoolbox.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index 02cdd13..a5a9920 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -58,6 +58,7 @@ ParsingToolBox::ParsingToolBox() m_arithmeticOperation->insert(QStringLiteral("x"),Die::MULTIPLICATION); m_arithmeticOperation->insert(QStringLiteral("/"),Die::DIVIDE); m_arithmeticOperation->insert(QStringLiteral("÷"),Die::DIVIDE); + m_arithmeticOperation->insert(QStringLiteral("^"),Die::POWER); } @@ -98,7 +99,7 @@ ExecutionNode* ParsingToolBox::addSort(ExecutionNode* e,bool b) bool ParsingToolBox::readDiceLogicOperator(QString& str,OperationCondition::ConditionOperator& op) { QString longKey; - foreach(QString tmp, m_conditionOperation->keys()) + for(const QString& tmp: m_conditionOperation->keys()) { if(str.startsWith(tmp)) { @@ -138,7 +139,7 @@ bool ParsingToolBox::readArithmeticOperator(QString &str, Die::ArithmeticOperato bool ParsingToolBox::readLogicOperator(QString& str,BooleanCondition::LogicOperator& op) { QString longKey; - foreach(QString tmp, m_logicOp->keys()) + for(const QString& tmp: m_logicOp->keys()) { if(str.startsWith(tmp)) { @@ -295,7 +296,7 @@ Validator* ParsingToolBox::readCompositeValidator(QString& str) bool ParsingToolBox::readLogicOperation(QString& str,CompositeValidator::LogicOperation& op) { QString longKey; - foreach(QString tmp, m_logicOperation->keys()) + for(const QString& tmp: m_logicOperation->keys()) { if(str.startsWith(tmp)) { @@ -569,7 +570,7 @@ void ParsingToolBox::readPainterParameter(PainterNode* painter,QString& str) QString data = str.left(pos); str=str.remove(0,pos+1); QStringList duos = data.split(','); - foreach(QString duoStr,duos) + for(const QString& duoStr : duos) { QStringList keyValu = duoStr.split(':'); if(keyValu.size()==2) |