aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/booleancondition.h
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2022-04-16 01:58:40 +0200
committerRenaud G <renaud@rolisteam.org>2022-04-16 02:59:30 +0200
commit6ba9324cf4864ebd2e2cdec8098b0889ceaea0a8 (patch)
treee29af0f803de724e28eab85da2dfe6c535a8292b /booleancondition.h
parent0c040da59e6aa2df3bd0c22e38b2afe0512d3749 (diff)
downloadOneRoll-6ba9324cf4864ebd2e2cdec8098b0889ceaea0a8.tar.gz
OneRoll-6ba9324cf4864ebd2e2cdec8098b0889ceaea0a8.zip
Make sure Windows compilation works
Diffstat (limited to 'booleancondition.h')
-rw-r--r--booleancondition.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/booleancondition.h b/booleancondition.h
index 88bab30..d49c5fe 100644
--- a/booleancondition.h
+++ b/booleancondition.h
@@ -22,6 +22,7 @@
#ifndef BOOLEANCONDITION_H
#define BOOLEANCONDITION_H
+#include "diceparser/diceparserhelper.h"
#include "node/executionnode.h"
#include "validator.h"
#include <Qt>
@@ -32,22 +33,12 @@
class BooleanCondition : public Validator
{
public:
- enum LogicOperator
- {
- Equal,
- GreaterThan,
- LesserThan,
- GreaterOrEqual,
- LesserOrEqual,
- Different
- };
-
BooleanCondition();
virtual ~BooleanCondition() override;
virtual qint64 hasValid(Die* b, bool recursive, bool unhighlight= false) const override;
- void setOperator(LogicOperator m);
+ void setOperator(Dice::CompareOperator m);
void setValueNode(ExecutionNode*);
QString toString() override;
@@ -62,9 +53,9 @@ private:
qint64 valueToScalar() const;
private:
- LogicOperator m_operator;
+ Dice::CompareOperator m_operator;
ExecutionNode* m_value= nullptr;
};
-Q_DECLARE_METATYPE(BooleanCondition::LogicOperator)
+// Q_DECLARE_METATYPE(BooleanCondition::LogicOperator)
#endif // BOOLEANCONDITION_H