aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2018-11-11 19:46:42 +0100
committerRenaud G <renaud@rolisteam.org>2018-11-11 19:46:42 +0100
commit48de810db56b728726ec8b499b9a12c687b53795 (patch)
tree7d8b1dc8f0aa98e3f3995e6984b1a23ec7d9e7dc
parent750cc31e9157bf92f54a66b8a076e5287c4cef3a (diff)
downloadOneRoll-48de810db56b728726ec8b499b9a12c687b53795.tar.gz
OneRoll-48de810db56b728726ec8b499b9a12c687b53795.zip
prevent warning
-rw-r--r--die.cpp3
-rw-r--r--node/keepdiceexecnode.cpp6
-rw-r--r--operationcondition.cpp2
3 files changed, 7 insertions, 4 deletions
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<qint64>(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<Die*> diceList3= diceList.mid(0,m_numberOfDice);
+ QList<Die*> diceList3= diceList.mid(0,static_cast<int>(m_numberOfDice));
QList<Die*> diceList2;
for(Die* die : diceList3)
@@ -64,12 +64,12 @@ void KeepDiceExecNode::run(ExecutionNode* previous)
- if(m_numberOfDice > static_cast<quint64>(diceList.size()))
+ if(m_numberOfDice > static_cast<qint64>(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<int>(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<qint64,qint64> range) const
+bool OperationCondition::isValidRangeSize(std::pair<qint64,qint64>) const
{
auto value = valueToScalar();
bool valid = true;