aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/diceparser.cpp
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 /diceparser.cpp
parentf238c80409b345482d4a292084b3813dcdbbb37f (diff)
parent52343ff414f7b41e8f38e28bec3de39500b5fed2 (diff)
downloadOneRoll-cdaac5c82433b97ae17d0576b185a7fd689c89a9.tar.gz
OneRoll-cdaac5c82433b97ae17d0576b185a7fd689c89a9.zip
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'diceparser.cpp')
-rw-r--r--diceparser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/diceparser.cpp b/diceparser.cpp
index 22ff52f..41a91e5 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -155,6 +155,7 @@ void DiceParser::insertAlias(DiceAlias* dice, int i)
bool DiceParser::parseLine(QString str, bool allowAlias)
{
m_errorMap.clear();
+ m_comment = QStringLiteral("");
if(!m_startNodes.empty())
{
qDeleteAll(m_startNodes);
@@ -1329,7 +1330,7 @@ void DiceParser::setPathToHelp(QString l)
{
m_helpPath = l;
}
-void DiceParser::setVariableDictionary(QHash<QString,QString>* variables)
+void DiceParser::setVariableDictionary(const QHash<QString,QString>& variables)
{
ParsingToolBox::setVariableHash(variables);
}