From 0490332a1e85458059aa761c7a0769fe2fe985c7 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Thu, 2 Aug 2018 15:56:53 +0200
Subject: Clean up Comment line

Clean up Comment line
---
 diceparser.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'diceparser.cpp')

diff --git a/diceparser.cpp b/diceparser.cpp
index 22ff52f..1a065b7 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);
-- 
cgit v1.2.3-70-g09d2


From acb001bc1909d873a37fbe1c8cbabade76a8015e Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Sun, 12 Aug 2018 23:54:31 +0200
Subject: Change management of variable (ref instead of pointer) using static
 is a bad idea as more and more diceparser are now use in rolisteam.

---
 diceparser.cpp     |  2 +-
 diceparser.h       |  2 +-
 parsingtoolbox.cpp | 12 ++++++------
 parsingtoolbox.h   |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'diceparser.cpp')

diff --git a/diceparser.cpp b/diceparser.cpp
index 1a065b7..41a91e5 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -1330,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);
 }
diff --git a/diceparser.h b/diceparser.h
index ad831cf..2ede553 100644
--- a/diceparser.h
+++ b/diceparser.h
@@ -213,7 +213,7 @@ public:
      * @brief setVariableDictionary
      * @param variables
      */
-    void setVariableDictionary(QHash<QString,QString>* variables);
+    void setVariableDictionary(const QHash<QString, QString> &variables);
     QString getComment() const;
     void setComment(const QString &comment);
 
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index bd326e2..eec190e 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -28,7 +28,7 @@
 #include "node/stringnode.h"
 
 
-QHash<QString,QString>*  ParsingToolBox::m_variableHash = nullptr;
+QHash<QString,QString>  ParsingToolBox::m_variableHash;
 std::vector<ExecutionNode*>*  ParsingToolBox::m_startNodes = nullptr;
 
 ParsingToolBox::ParsingToolBox()
@@ -491,11 +491,11 @@ bool ParsingToolBox::readVariable(QString &str, qint64 &myNumber, QString& reaso
     int post = str.indexOf('}');
     key = str.left(post);
 
-    if(nullptr!=m_variableHash)
+    if(!m_variableHash.isEmpty())
     {
-        if(m_variableHash->contains(key))
+        if(m_variableHash.contains(key))
         {
-            QString value = m_variableHash->value(key);
+            QString value = m_variableHash.value(key);
             bool ok;
             int valueInt = value.toInt(&ok);
             if(ok)
@@ -662,12 +662,12 @@ void ParsingToolBox::readPainterParameter(PainterNode* painter,QString& str)
     }
 }
 
-QHash<QString, QString> *ParsingToolBox::getVariableHash()
+QHash<QString, QString> ParsingToolBox::getVariableHash()
 {
     return m_variableHash;
 }
 
-void ParsingToolBox::setVariableHash(QHash<QString, QString> *variableHash)
+void ParsingToolBox::setVariableHash(const QHash<QString, QString>& variableHash)
 {
     m_variableHash = variableHash;
 }
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;
 };
 
-- 
cgit v1.2.3-70-g09d2