diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-10-11 22:13:07 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-10-11 22:13:07 +0200 |
| commit | 9e9dd15316e80cae916c532d13ddc5ddc5e93697 (patch) | |
| tree | 52f0daa73bcd36d3562cb80847cc4536355448fc /node/scalaroperatornode.h | |
| parent | 80ff2a99b45a25695321cc84a30a3fbf3b797d54 (diff) | |
| parent | 1ccb6b4c0454fae8ebc4ebdca9ab74588d3d8707 (diff) | |
| download | OneRoll-9e9dd15316e80cae916c532d13ddc5ddc5e93697.tar.gz OneRoll-9e9dd15316e80cae916c532d13ddc5ddc5e93697.zip | |
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Diffstat (limited to 'node/scalaroperatornode.h')
| -rw-r--r-- | node/scalaroperatornode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h index e43f6f8..ea0f7e1 100644 --- a/node/scalaroperatornode.h +++ b/node/scalaroperatornode.h @@ -42,7 +42,7 @@ public: bool setOperatorChar(QChar c); void setInternalNode(ExecutionNode* node); - virtual QString toString()const; + virtual QString toString(bool wl)const; virtual qint64 getPriority() const; void generateDotTree(QString& s); @@ -60,9 +60,9 @@ private: private: ScalarOperator m_operator; + ScalarResult* m_scalarResult; ExecutionNode* m_internalNode; QMap<QChar,ScalarOperator> m_scalarOperationList; - ScalarResult* m_scalarResult; }; #endif // SCALAROPERATORNODE_H |