diff options
| author | 2018-03-17 19:56:39 +0100 | |
|---|---|---|
| committer | 2018-03-17 19:56:39 +0100 | |
| commit | 5ff5516c8cab5599375234a9a1898b737e8541f2 (patch) | |
| tree | bb500dbc5f155fe007b7833a017ab53875127aaa /node | |
| parent | dd5ec0eb06c439781a7f9f06211527f1c51f3165 (diff) | |
| download | OneRoll-5ff5516c8cab5599375234a9a1898b737e8541f2.tar.gz OneRoll-5ff5516c8cab5599375234a9a1898b737e8541f2.zip | |
-c++11 for loop (instead foreach)
Diffstat (limited to 'node')
| -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 |
7 files changed, 9 insertions, 9 deletions
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)) { |