aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2019-09-24 13:40:53 +0200
committerRenaud G <renaud@rolisteam.org>2019-09-24 23:04:27 +0200
commitbec6706b14525e5b886a8551bf6c644a828d635a (patch)
treef95461e5349f98ca3db0a5d8549e1dce1a4f49a6
parent72809636ec8efd84c7122bc1c68bf9db4df226f4 (diff)
downloadOneRoll-bec6706b14525e5b886a8551bf6c644a828d635a.tar.gz
OneRoll-bec6706b14525e5b886a8551bf6c644a828d635a.zip
Remove warnings
-rw-r--r--diceparser.cpp5
-rw-r--r--node/countexecutenode.cpp5
-rw-r--r--parsingtoolbox.cpp12
3 files changed, 10 insertions, 12 deletions
diff --git a/diceparser.cpp b/diceparser.cpp
index 4f5108c..83e8ce9 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -253,7 +253,7 @@ bool DiceParser::readExpression(QString& str, ExecutionNode*& node)
{
// operandNode->setNextNode(operatorNode);
operandNode= ParsingToolBox::getLatestNode(operandNode);
- };
+ }
return true;
}
else if(readCommand(str, operandNode))
@@ -335,7 +335,7 @@ bool DiceParser::readValuesList(QString& str, ExecutionNode*& node)
if(ParsingToolBox::readDynamicVariable(var, number))
{
VariableNode* variableNode= new VariableNode();
- variableNode->setIndex(number - 1);
+ variableNode->setIndex(static_cast<quint64>(number - 1));
variableNode->setData(&m_startNodes);
values->insertValue(variableNode);
}
@@ -510,7 +510,6 @@ void DiceParser::getDiceResultFromAllInstruction(QList<ExportedDiceResult>& resu
{
ExecutionNode* next= getLeafNode(start);
Result* result= next->getResult();
- // qDebug() << "result id" << result->toString(true);
ExportedDiceResult nodeResult;
while(nullptr != result)
{
diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp
index bc8e3b3..c9b78b2 100644
--- a/node/countexecutenode.cpp
+++ b/node/countexecutenode.cpp
@@ -59,11 +59,10 @@ QString CountExecuteNode::toString(bool withlabel) const
qint64 CountExecuteNode::getPriority() const
{
qint64 priority= 0;
- if(nullptr != m_nextNode)
+ if(nullptr != m_previousNode)
{
- priority= m_nextNode->getPriority();
+ priority= m_previousNode->getPriority();
}
-
return priority;
}
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 94dd098..a28ad30 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -167,7 +167,7 @@ bool ParsingToolBox::readOperand(QString& str, ExecutionNode*& node)
if(readDynamicVariable(str, intValue))
{
VariableNode* variableNode= new VariableNode();
- variableNode->setIndex(intValue - 1);
+ variableNode->setIndex(static_cast<quint64>(intValue - 1));
variableNode->setData(m_startNodes);
node= variableNode;
return true;
@@ -722,7 +722,7 @@ void ParsingToolBox::readProbability(QStringList& str, QList<Range>& ranges)
Range range;
range.setValue(start, end);
ranges.append(range);
- totalDistance+= end - start + 1;
+ totalDistance+= static_cast<quint64>(end - start + 1);
++i;
}
else // percentage
@@ -732,11 +732,11 @@ void ParsingToolBox::readProbability(QStringList& str, QList<Range>& ranges)
range.setStart(start);
ranges.append(range);
++undefCount;
- undefDistance+= start;
+ undefDistance+= static_cast<quint64>(start);
}
if((end > maxValue) || (i == 1))
{
- maxValue= end;
+ maxValue= static_cast<int>(end);
}
}
else
@@ -757,11 +757,11 @@ void ParsingToolBox::readProbability(QStringList& str, QList<Range>& ranges)
Range tmp= ranges.at(i);
if(!tmp.isFullyDefined())
{
- int dist= tmp.getStart();
+ int dist= static_cast<int>(tmp.getStart());
tmp.setStart(realStart + 1);
double truc= dist * ratio;
- tmp.setEnd(realStart + truc);
+ tmp.setEnd(static_cast<int>(realStart + truc));
realStart= tmp.getEnd();
ranges[i]= tmp;
}