aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/diceparser.h
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2015-09-07 08:35:31 +0200
committerRenaud G <renaud@rolisteam.org>2015-09-07 08:35:31 +0200
commit5f2226d1c4eb03a5b7cdfdd4f30a968e4b526b2a (patch)
tree7dc5b5247e90c5c0a338ce4444a8fbb5d3637488 /diceparser.h
parentc6449aebc9b16042672a2dffb5d1b3794584005b (diff)
parent7ce5a4af6fb836432eb6ce7637ea09d6a5b4e0bd (diff)
downloadOneRoll-5f2226d1c4eb03a5b7cdfdd4f30a968e4b526b2a.tar.gz
OneRoll-5f2226d1c4eb03a5b7cdfdd4f30a968e4b526b2a.zip
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Diffstat (limited to 'diceparser.h')
-rw-r--r--diceparser.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/diceparser.h b/diceparser.h
index 487216f..6b9056f 100644
--- a/diceparser.h
+++ b/diceparser.h
@@ -196,6 +196,14 @@ public:
* @return
*/
QStringList getAllStringResult(bool& hasAlias);
+ /**
+ * @brief getAllDiceResult
+ * @param hasAlias
+ * @return
+ */
+ QStringList getAllDiceResult(bool& hasAlias);
+
+ bool hasSeparator()const;
private:
/**
@@ -302,6 +310,7 @@ private:
QString m_command;
ParsingToolBox* m_parsingToolbox;
QString m_helpPath;
+ bool m_currentTreeHasSeparator;
};
#endif // DICEPARSER_H