aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/parsingtoolbox.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2018-08-12 23:54:31 +0200
committerRenaud G <renaud@rolisteam.org>2018-08-12 23:54:31 +0200
commitacb001bc1909d873a37fbe1c8cbabade76a8015e (patch)
tree224a3b06e565bd479cd2dbd1ac7a8cddf317b626 /parsingtoolbox.cpp
parent0490332a1e85458059aa761c7a0769fe2fe985c7 (diff)
downloadOneRoll-acb001bc1909d873a37fbe1c8cbabade76a8015e.tar.gz
OneRoll-acb001bc1909d873a37fbe1c8cbabade76a8015e.zip
Change management of variable (ref instead of pointer)
using static is a bad idea as more and more diceparser are now use in rolisteam.
Diffstat (limited to 'parsingtoolbox.cpp')
-rw-r--r--parsingtoolbox.cpp12
1 files changed, 6 insertions, 6 deletions
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;
}