diff options
| author |   renaud guezennec <renaud@rolisteam.org> | 2019-07-29 20:35:52 +0000 |
|---|---|---|
| committer | renaud guezennec <renaud@rolisteam.org> | 2019-07-29 20:35:52 +0000 |
| commit | 1a902d383eef1e042d4462cd07b9384fcdf4d118 (patch) | |
| tree | 766b8ab720fa5da11730d2fc2388f51b9d14de49 /result/result.h | |
| parent | f5906125576a8323a731c9456ce3dfc53b67ef59 (diff) | |
| parent | 0d4b68221bda594cc695d216dfa21306ddb69c85 (diff) | |
| download | OneRoll-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/result.h')
| -rw-r--r-- | result/result.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/result/result.h b/result/result.h index 8f31c05..76f3a8c 100644 --- a/result/result.h +++ b/result/result.h @@ -22,7 +22,7 @@ #ifndef RESULT_H #define RESULT_H -//#include <Qt> +#include "diceparserhelper.h" #include <QString> #include <QVariant> /** @@ -32,16 +32,6 @@ class Result { public: /** - * @brief The RESULT_TYPE enum or combinaison - */ - enum RESULT_TYPE - { - NONE= 0, - SCALAR= 1, - STRING= 2, - DICE_LIST= 4 - }; - /** * @brief Result */ Result(); @@ -54,12 +44,12 @@ public: * @brief isScalar * @return */ - virtual bool hasResultOfType(RESULT_TYPE) const; + virtual bool hasResultOfType(Dice::RESULT_TYPE) const; /** * @brief getScalar * @return */ - virtual QVariant getResult(RESULT_TYPE)= 0; + virtual QVariant getResult(Dice::RESULT_TYPE)= 0; /** * @brief getPrevious * @return @@ -100,7 +90,7 @@ protected: QString m_id; private: - Result* m_previous; /// @brief + Result* m_previous= nullptr; /// @brief }; #endif // RESULT_H |