From ab902d65c6640e7b388cc5d89588e2fc6b32759a Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sat, 27 Oct 2018 00:25:05 +0200 Subject: Clean up die class. --- die.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'die.cpp') diff --git a/die.cpp b/die.cpp index 7cacf18..d398021 100644 --- a/die.cpp +++ b/die.cpp @@ -29,13 +29,8 @@ Die::Die() : m_hasValue(false),m_displayStatus(false),m_highlighted(true),m_base(1),m_color(""),m_op(Die::PLUS)//,m_mt(m_randomDevice) { -// uint seed = quintptr(this) + QDateTime::currentDateTime().toMSecsSinceEpoch(); - - // qsrand(seed); - auto seed = std::chrono::high_resolution_clock::now().time_since_epoch().count(); m_rng = std::mt19937(quintptr(this)+seed); - } Die::Die(const Die& die) { -- cgit v1.2.3-70-g09d2 From 48de810db56b728726ec8b499b9a12c687b53795 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sun, 11 Nov 2018 19:46:42 +0100 Subject: prevent warning --- die.cpp | 3 +++ node/keepdiceexecnode.cpp | 6 +++--- operationcondition.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'die.cpp') diff --git a/die.cpp b/die.cpp index d398021..784287d 100644 --- a/die.cpp +++ b/die.cpp @@ -103,6 +103,9 @@ qint64 Die::getValue() const //error(); } break; + case POW: + value=static_cast(std::pow(value,tmp)); + break; } } else diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp index 347931d..dbd1591 100644 --- a/node/keepdiceexecnode.cpp +++ b/node/keepdiceexecnode.cpp @@ -51,7 +51,7 @@ void KeepDiceExecNode::run(ExecutionNode* previous) m_numberOfDice = diceList.size() + m_numberOfDice; } - QList diceList3= diceList.mid(0,m_numberOfDice); + QList diceList3= diceList.mid(0,static_cast(m_numberOfDice)); QList diceList2; for(Die* die : diceList3) @@ -64,12 +64,12 @@ void KeepDiceExecNode::run(ExecutionNode* previous) - if(m_numberOfDice > static_cast(diceList.size())) + if(m_numberOfDice > static_cast(diceList.size())) { m_errors.insert(TOO_MANY_DICE,QObject::tr(" You ask to keep %1 dice but the result only has %2").arg(m_numberOfDice).arg(diceList.size())); } - for(Die* tmp : diceList.mid(m_numberOfDice,-1)) + for(Die* tmp : diceList.mid(static_cast(m_numberOfDice),-1)) { tmp->setHighlighted(false); } diff --git a/operationcondition.cpp b/operationcondition.cpp index 2a83fec..6b4e819 100644 --- a/operationcondition.cpp +++ b/operationcondition.cpp @@ -108,7 +108,7 @@ QString OperationCondition::toString() } return QStringLiteral("[%1%2%3]").arg(str).arg(valueToScalar()).arg(m_boolean->toString()); } -bool OperationCondition::isValidRangeSize(std::pair range) const +bool OperationCondition::isValidRangeSize(std::pair) const { auto value = valueToScalar(); bool valid = true; -- cgit v1.2.3-70-g09d2