diff options
| -rw-r--r-- | compositevalidator.cpp | 4 | ||||
| -rw-r--r-- | node/countexecutenode.cpp | 2 | ||||
| -rw-r--r-- | node/executionnode.cpp | 2 | ||||
| -rw-r--r-- | node/jumpbackwardnode.cpp | 2 | ||||
| -rw-r--r-- | node/listaliasnode.cpp | 4 | ||||
| -rw-r--r-- | node/listsetrollnode.cpp | 2 | ||||
| -rw-r--r-- | node/paintnode.cpp | 2 | ||||
| -rw-r--r-- | node/rerolldicenode.cpp | 4 | ||||
| -rw-r--r-- | parsingtoolbox.cpp | 6 | ||||
| -rw-r--r-- | result/diceresult.cpp | 2 |
10 files changed, 16 insertions, 14 deletions
diff --git a/compositevalidator.cpp b/compositevalidator.cpp index bbf8c0f..56dc136 100644 --- a/compositevalidator.cpp +++ b/compositevalidator.cpp @@ -40,7 +40,7 @@ qint64 CompositeValidator::hasValid(Die* b,bool recursive,bool unhighlight) cons int i = 0; qint64 sum = 0; bool highLight = false; - foreach(const Validator* validator, *m_validatorList) + for(const Validator* validator: *m_validatorList) { qint64 val = validator->hasValid(b,recursive,unhighlight); if(i==0) @@ -69,6 +69,8 @@ qint64 CompositeValidator::hasValid(Die* b,bool recursive,bool unhighlight) cons case AND: sum &= val; break; + default: + break; } } ++i; diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp index 84946df..205c6d7 100644 --- a/node/countexecutenode.cpp +++ b/node/countexecutenode.cpp @@ -33,7 +33,7 @@ void CountExecuteNode::run(ExecutionNode *previous) m_result->setPrevious(previousResult); QList<Die*> diceList=previousResult->getResultList(); qint64 sum = 0; - foreach(Die* dice,diceList) + for(Die* dice:diceList) { if(nullptr!=m_validator) { diff --git a/node/executionnode.cpp b/node/executionnode.cpp index 73272b4..fadc9fb 100644 --- a/node/executionnode.cpp +++ b/node/executionnode.cpp @@ -41,7 +41,7 @@ QMap<ExecutionNode::DICE_ERROR_CODE,QString> ExecutionNode::getExecutionErrorMap { if(nullptr!=m_nextNode) { - foreach (ExecutionNode::DICE_ERROR_CODE key, m_nextNode->getExecutionErrorMap().keys()) + for(ExecutionNode::DICE_ERROR_CODE key: m_nextNode->getExecutionErrorMap().keys()) { m_errors.insert(key,m_nextNode->getExecutionErrorMap().value(key)); } diff --git a/node/jumpbackwardnode.cpp b/node/jumpbackwardnode.cpp index 1309b3b..2ca8874 100644 --- a/node/jumpbackwardnode.cpp +++ b/node/jumpbackwardnode.cpp @@ -130,7 +130,7 @@ void JumpBackwardNode::run(ExecutionNode* previous) DiceResult* diceResult = dynamic_cast<DiceResult*>(result); if(nullptr!=diceResult) { - foreach(Die* die,diceResult->getResultList()) + for(Die* die:diceResult->getResultList()) { Die* tmpdie = new Die(); *tmpdie=*die; diff --git a/node/listaliasnode.cpp b/node/listaliasnode.cpp index 764d156..eac2da5 100644 --- a/node/listaliasnode.cpp +++ b/node/listaliasnode.cpp @@ -46,7 +46,7 @@ void ListAliasNode::run(ExecutionNode* previous ) QString ListAliasNode::buildList() const { QString result(QObject::tr("List of Alias:\n")); - foreach(DiceAlias* key, *m_aliasList) + for(DiceAlias* key: *m_aliasList) { result+=QString("%1 : %2\n").arg(key->getCommand()).arg(key->getValue()); } @@ -55,7 +55,7 @@ QString ListAliasNode::buildList() const QString ListAliasNode::toString(bool wl) const { QStringList resultList; - foreach(DiceAlias* key, *m_aliasList) + for(DiceAlias* key: *m_aliasList) { resultList << "{" <<key->getCommand() << key->getValue()<< "}"; } diff --git a/node/listsetrollnode.cpp b/node/listsetrollnode.cpp index e6ffd00..eca6168 100644 --- a/node/listsetrollnode.cpp +++ b/node/listsetrollnode.cpp @@ -113,7 +113,7 @@ void ListSetRollNode::computeFacesNumber(Die* die) Q_ASSERT(m_values.size() == m_rangeList.size()); qint64 max; int i=0; - foreach(Range range, m_rangeList) + for(Range range: m_rangeList) { if(((i==0)||(max<range.getEnd()))&&(range.isFullyDefined())) { diff --git a/node/paintnode.cpp b/node/paintnode.cpp index 2770891..ddd19de 100644 --- a/node/paintnode.cpp +++ b/node/paintnode.cpp @@ -78,7 +78,7 @@ void PainterNode::run(ExecutionNode* previous) { QList<Die*> diceList=previousDiceResult->getResultList(); int pastDice=0; - foreach(ColorItem item, m_colors) + for(ColorItem item:m_colors) { int current=item.colorNumber(); QList<Die*>::iterator it; diff --git a/node/rerolldicenode.cpp b/node/rerolldicenode.cpp index 1f8cd7e..c156dac 100644 --- a/node/rerolldicenode.cpp +++ b/node/rerolldicenode.cpp @@ -23,7 +23,7 @@ void RerollDiceNode::run(ExecutionNode* previous) m_result->setPrevious(previous_result); if(nullptr!=previous_result) { - foreach(Die* die,previous_result->getResultList()) + for(Die* die: previous_result->getResultList()) { Die* tmpdie = new Die(); *tmpdie=*die; @@ -34,7 +34,7 @@ void RerollDiceNode::run(ExecutionNode* previous) QList<Die*> list = m_diceResult->getResultList(); - foreach(Die* die, list) + for(Die* die: list) { if(m_validator->hasValid(die,false)) { diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index 2e383ba..1588f3e 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -98,7 +98,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 +138,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)) { @@ -607,7 +607,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(QString duoStr: duos) { QStringList keyValu = duoStr.split(':'); if(keyValu.size()==2) diff --git a/result/diceresult.cpp b/result/diceresult.cpp index f9f8253..b3d5e54 100644 --- a/result/diceresult.cpp +++ b/result/diceresult.cpp @@ -150,7 +150,7 @@ void DiceResult::setOperator(const Die::ArithmeticOperator& dieOperator) QString DiceResult::toString(bool wl) { QStringList scalarSum; - foreach(Die* die,m_diceValues) + for(Die* die:m_diceValues) { scalarSum << QString::number(die->getValue()); } |