aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/validatorlist.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 /validatorlist.h
parent0c040da59e6aa2df3bd0c22e38b2afe0512d3749 (diff)
downloadOneRoll-6ba9324cf4864ebd2e2cdec8098b0889ceaea0a8.tar.gz
OneRoll-6ba9324cf4864ebd2e2cdec8098b0889ceaea0a8.zip
Make sure Windows compilation works
Diffstat (limited to 'validatorlist.h')
-rw-r--r--validatorlist.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/validatorlist.h b/validatorlist.h
index 1faf7e6..ad2c9d4 100644
--- a/validatorlist.h
+++ b/validatorlist.h
@@ -27,7 +27,7 @@
#include <QVector>
#include <Qt>
-#include "diceparserhelper.h"
+#include <diceparser/diceparserhelper.h>
#include <functional>
class Validator;
@@ -75,20 +75,12 @@ private:
class ValidatorList
{
public:
- enum LogicOperation
- {
- OR,
- EXCLUSIVE_OR,
- AND,
- NONE
- };
-
ValidatorList();
virtual ~ValidatorList();
virtual qint64 hasValid(Die* b, bool recursive, bool unhighlight= false) const;
- void setOperationList(const QVector<LogicOperation>& m);
+ void setOperationList(const QVector<Dice::LogicOperation>& m);
void setValidators(const QList<Validator*>& valids);
QString toString();
@@ -100,7 +92,7 @@ public:
void validResult(Result* result, bool recursive, bool unlight, std::function<void(Die*, qint64)> functor) const;
private:
- QVector<LogicOperation> m_operators;
+ QVector<Dice::LogicOperation> m_operators;
QList<Validator*> m_validatorList;
};