aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/diceparser.h
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2015-04-29 07:44:25 +0200
committerRenaud G <renaud@rolisteam.org>2015-04-29 07:44:25 +0200
commit590fc6528b09bf1abbd90caf31053cd5ef6b439b (patch)
treed2dcbb2c751d9edf9b736a2fa5488fbcf41247dc /diceparser.h
parent942cf3f75f49d83c4e512d5350f7de69f0ec8aa7 (diff)
parent5c73a6cb13b8c301d0e60f916998c3e683a2b043 (diff)
downloadOneRoll-590fc6528b09bf1abbd90caf31053cd5ef6b439b.tar.gz
OneRoll-590fc6528b09bf1abbd90caf31053cd5ef6b439b.zip
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Diffstat (limited to 'diceparser.h')
-rw-r--r--diceparser.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/diceparser.h b/diceparser.h
index 7cf72de..84c815b 100644
--- a/diceparser.h
+++ b/diceparser.h
@@ -182,6 +182,11 @@ public:
* @return
*/
QString convertAlias(QString str);
+ /**
+ * @brief getErrorList
+ * @return
+ */
+ QMap<ExecutionNode::ERROR_CODE,QString> getErrorMap();
private:
/**
@@ -244,11 +249,6 @@ private:
*/
bool readOperand(QString&,ExecutionNode* & node);
- /**
- * @brief getErrorList
- * @return
- */
- QList<ExecutionNode::ERROR_CODE> getErrorList();
/**
* @brief readInstructionOperator
* @param c