diff options
| -rw-r--r-- | cli/displaytoolbox.cpp | 6 | ||||
| -rw-r--r-- | node/uniquenode.cpp | 24 | ||||
| -rw-r--r-- | result/stringresult.cpp | 2 |
3 files changed, 13 insertions, 19 deletions
diff --git a/cli/displaytoolbox.cpp b/cli/displaytoolbox.cpp index 5f0b64a..fc2c7ed 100644 --- a/cli/displaytoolbox.cpp +++ b/cli/displaytoolbox.cpp @@ -133,12 +133,12 @@ QJsonArray DisplayToolBox::diceToJson(QList<ExportedDiceResult>& diceList, bool& { allSameFaceCount= false; } - for(int face : dice.keys()) + for(quint64 face : dice.keys()) { ListDiceResult diceResults= dice.value(face); QJsonObject object; QJsonArray values; - object["face"]= face; + object["face"]= static_cast<int>(face); for(auto const& dice : diceResults) { QJsonObject diceObj; @@ -146,7 +146,7 @@ QJsonArray DisplayToolBox::diceToJson(QList<ExportedDiceResult>& diceList, bool& if(!listValues.isEmpty()) { diceObj["total"]= static_cast<qint64>(listValues.takeFirst()); - diceObj["face"]= face; + diceObj["face"]= static_cast<int>(face); auto color= dice.getColor(); diceObj["color"]= color; if(!colorList.contains(color)) diff --git a/node/uniquenode.cpp b/node/uniquenode.cpp index e937c6d..0b69d39 100644 --- a/node/uniquenode.cpp +++ b/node/uniquenode.cpp @@ -31,31 +31,27 @@ void UniqueNode::run(ExecutionNode* previous) if(nullptr != previous) { m_result->setPrevious(previous->getResult()); - - Result* tmpResult= previous->getResult(); if(nullptr != tmpResult) { DiceResult* dice= dynamic_cast<DiceResult*>(tmpResult); if(nullptr != dice) { - auto const& resultList = dice->getResultList(); + auto const& resultList= dice->getResultList(); std::vector<qint64> formerValues; formerValues.reserve(resultList.size()); for(auto& oldDie : resultList) { - auto value=oldDie->getValue(); - auto it = std::find(formerValues.begin(), formerValues.end(), value); - + auto value= oldDie->getValue(); + auto it= std::find(formerValues.begin(), formerValues.end(), value); - if(it == formerValues.end()) - { - auto die = new Die(*oldDie); - //*die = *oldDie; - m_diceResult->insertResult(die); - formerValues.push_back(value); - } - oldDie->displayed(); + if(it == formerValues.end()) + { + auto die= new Die(*oldDie); + m_diceResult->insertResult(die); + formerValues.push_back(value); + } + oldDie->displayed(); } } } diff --git a/result/stringresult.cpp b/result/stringresult.cpp index 9685bd8..a44e24e 100644 --- a/result/stringresult.cpp +++ b/result/stringresult.cpp @@ -34,10 +34,8 @@ QVariant StringResult::getResult(RESULT_TYPE type) { case STRING: return getText(); - break; case SCALAR: return getText().toInt(); - break; default: return QVariant(); } |