diff options
Diffstat (limited to 'booleancondition.h')
| -rw-r--r-- | booleancondition.h | 17 |
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 |