diff options
| author |   Renaud G <renaud@rolisteam.org> | 2016-05-05 16:15:42 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2016-05-05 16:15:42 +0200 |
| commit | 64c35992db5352833ccd6cb623dbb9e9362834dc (patch) | |
| tree | 3c138e6727b059785d9beb8957c051952b1f0830 /node | |
| parent | 30bdb9a0e446350846fc0cac82b8a22c4bdd983f (diff) | |
| parent | f34506d0795069a1be216c2c1a5c11c0b369efa6 (diff) | |
| download | OneRoll-64c35992db5352833ccd6cb623dbb9e9362834dc.tar.gz OneRoll-64c35992db5352833ccd6cb623dbb9e9362834dc.zip | |
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'node')
| -rw-r--r-- | node/countexecutenode.h | 2 | ||||
| -rw-r--r-- | node/dicerollernode.cpp | 2 | ||||
| -rw-r--r-- | node/dicerollernode.h | 2 | ||||
| -rw-r--r-- | node/rerolldicenode.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/node/countexecutenode.h b/node/countexecutenode.h index 167ee82..15b2509 100644 --- a/node/countexecutenode.h +++ b/node/countexecutenode.h @@ -38,8 +38,8 @@ public: virtual qint64 getPriority() const; private: - Validator* m_validator; ScalarResult* m_scalarResult; + Validator* m_validator; }; #endif // COUNTEXECUTENODE_H diff --git a/node/dicerollernode.cpp b/node/dicerollernode.cpp index d8fe49c..e6f2950 100644 --- a/node/dicerollernode.cpp +++ b/node/dicerollernode.cpp @@ -46,7 +46,7 @@ void DiceRollerNode::run(ExecutionNode* previous) } } -quint64 DiceRollerNode::getFaces() +quint64 DiceRollerNode::getFaces() const { return m_faces; } diff --git a/node/dicerollernode.h b/node/dicerollernode.h index 808676f..2de1cfe 100644 --- a/node/dicerollernode.h +++ b/node/dicerollernode.h @@ -27,7 +27,7 @@ public: * @brief getFaces accessor * @return the face count */ - quint64 getFaces(); + quint64 getFaces() const; /** * @brief toString diff --git a/node/rerolldicenode.h b/node/rerolldicenode.h index f456bb3..2a98b4a 100644 --- a/node/rerolldicenode.h +++ b/node/rerolldicenode.h @@ -53,9 +53,9 @@ public: virtual qint64 getPriority() const; private: - Validator* m_validator; DiceResult* m_myDiceResult; bool m_adding; + Validator* m_validator; }; #endif // REROLLDICENODE_H |