aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/parsingtoolbox.h
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2018-08-27 01:03:42 +0200
committerRenaud G <renaud@rolisteam.org>2018-08-27 01:03:42 +0200
commitcdaac5c82433b97ae17d0576b185a7fd689c89a9 (patch)
tree39f48a45f74a4142dcd2f9533842bf25b5faf2f6 /parsingtoolbox.h
parentf238c80409b345482d4a292084b3813dcdbbb37f (diff)
parent52343ff414f7b41e8f38e28bec3de39500b5fed2 (diff)
downloadOneRoll-cdaac5c82433b97ae17d0576b185a7fd689c89a9.tar.gz
OneRoll-cdaac5c82433b97ae17d0576b185a7fd689c89a9.zip
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'parsingtoolbox.h')
-rw-r--r--parsingtoolbox.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/parsingtoolbox.h b/parsingtoolbox.h
index 4a88732..be0b0eb 100644
--- a/parsingtoolbox.h
+++ b/parsingtoolbox.h
@@ -178,8 +178,8 @@ public:
static void readPainterParameter(PainterNode *painter, QString &str);
- static QHash<QString, QString> *getVariableHash();
- static void setVariableHash(QHash<QString, QString> *variableHash);
+ static QHash<QString, QString> getVariableHash();
+ static void setVariableHash(const QHash<QString, QString> &variableHash);
/**
* @brief readConditionType
* @param str
@@ -202,7 +202,7 @@ private:
QHash<QString,Die::ArithmeticOperator>* m_arithmeticOperation;
- static QHash<QString,QString>* m_variableHash;
+ static QHash<QString,QString> m_variableHash;
static std::vector<ExecutionNode*>* m_startNodes;
};