From 6ba9324cf4864ebd2e2cdec8098b0889ceaea0a8 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sat, 16 Apr 2022 01:58:40 +0200 Subject: Make sure Windows compilation works --- die.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'die.h') diff --git a/die.h b/die.h index ff4ccf5..2da2006 100644 --- a/die.h +++ b/die.h @@ -25,6 +25,8 @@ #include #include #include + +#include "diceparser/diceparserhelper.h" /** * @brief The Die class implements all methods required from a die. You must set the Faces first, then you can roll it * and roll it again, to add or replace the previous result. @@ -32,18 +34,6 @@ class Die { public: - /** - * @brief The ArithmeticOperator enum - */ - enum ArithmeticOperator - { - PLUS, - MINUS, - DIVIDE, - MULTIPLICATION, - INTEGER_DIVIDE, - POW - }; /** * @brief Die */ @@ -140,8 +130,8 @@ public: qint64 getMaxValue() const; void setMaxValue(const qint64& maxValue); - Die::ArithmeticOperator getOp() const; - void setOp(const Die::ArithmeticOperator& op); + Dice::ArithmeticOperator getOp() const; + void setOp(const Dice::ArithmeticOperator& op); void setDisplayed(bool b); QString getUuid() const; @@ -162,7 +152,7 @@ private: qint64 m_occurence{1}; QString m_color; - Die::ArithmeticOperator m_op; + Dice::ArithmeticOperator m_op; static std::mt19937 s_rng; }; -- cgit v1.2.3-70-g09d2