aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/result/diceresult.cpp
diff options
context:
space:
mode:
authorrenaud guezennec <renaud@rolisteam.org>2019-07-29 20:35:52 +0000
committerrenaud guezennec <renaud@rolisteam.org>2019-07-29 20:35:52 +0000
commit1a902d383eef1e042d4462cd07b9384fcdf4d118 (patch)
tree766b8ab720fa5da11730d2fc2388f51b9d14de49 /result/diceresult.cpp
parentf5906125576a8323a731c9456ce3dfc53b67ef59 (diff)
parent0d4b68221bda594cc695d216dfa21306ddb69c85 (diff)
downloadOneRoll-1a902d383eef1e042d4462cd07b9384fcdf4d118.tar.gz
OneRoll-1a902d383eef1e042d4462cd07b9384fcdf4d118.zip
Merge branch 'liberation' into 'master'
Add fuzzer on the DiceParser See merge request kde/rolisteam-diceparser!2
Diffstat (limited to 'result/diceresult.cpp')
-rw-r--r--result/diceresult.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/result/diceresult.cpp b/result/diceresult.cpp
index e66fc4f..23b925e 100644
--- a/result/diceresult.cpp
+++ b/result/diceresult.cpp
@@ -25,7 +25,7 @@
DiceResult::DiceResult() : m_operator(Die::PLUS)
{
- m_resultTypes= (DICE_LIST | SCALAR);
+ m_resultTypes= (static_cast<int>(Dice::RESULT_TYPE::DICE_LIST) | static_cast<int>(Dice::RESULT_TYPE::SCALAR));
m_homogeneous= true;
}
void DiceResult::insertResult(Die* die)
@@ -63,15 +63,15 @@ DiceResult::~DiceResult()
m_diceValues.clear();
}
}
-QVariant DiceResult::getResult(RESULT_TYPE type)
+QVariant DiceResult::getResult(Dice::RESULT_TYPE type)
{
switch(type)
{
- case SCALAR:
+ case Dice::RESULT_TYPE::SCALAR:
{
return getScalarResult();
}
- case DICE_LIST:
+ case Dice::RESULT_TYPE::DICE_LIST:
{
return QVariant();
}