aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/parsingtoolbox.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'parsingtoolbox.cpp')
-rw-r--r--parsingtoolbox.cpp9
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)