aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2016-04-21 06:55:13 +0200
committerRenaud G <renaud@rolisteam.org>2016-04-21 06:55:13 +0200
commit5824cd895d42fa83b7c756984f006e53d237c776 (patch)
tree47d818c54c2dba0ee7b5a48ee1a323a2daad60b6
parent1e2c2131bfa90256817bc0299892af06bcfca608 (diff)
downloadOneRoll-5824cd895d42fa83b7c756984f006e53d237c776.tar.gz
OneRoll-5824cd895d42fa83b7c756984f006e53d237c776.zip
fix cppcheck error.
-rw-r--r--parsingtoolbox.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 7950e4d..705f777 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -27,8 +27,12 @@
QHash<QString,QString>* ParsingToolBox::m_variableHash = NULL;
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_logicOp = new QMap<QString,BooleanCondition::LogicOperator>();
+ //m_logicOp = ;
m_logicOp->insert(">=",BooleanCondition::GreaterOrEqual);
m_logicOp->insert("<=",BooleanCondition::LesserOrEqual);
m_logicOp->insert("<",BooleanCondition::LesserThan);
@@ -36,16 +40,16 @@ ParsingToolBox::ParsingToolBox()
m_logicOp->insert(">",BooleanCondition::GreaterThan);
- m_logicOperation = new QMap<QString,CompositeValidator::LogicOperation>();
+ //m_logicOperation = ;
m_logicOperation->insert("|",CompositeValidator::OR);
m_logicOperation->insert("^",CompositeValidator::EXCLUSIVE_OR);
m_logicOperation->insert("&",CompositeValidator::AND);
- m_conditionOperation = new QMap<QString,OperationCondition::ConditionOperator>();
+ // m_conditionOperation = ;
m_conditionOperation->insert("%",OperationCondition::Modulo);
- m_arithmeticOperation = new QHash<QString,ScalarOperatorNode::ArithmeticOperator>();
+ //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);