clazy warnings

26 files changed, 77 insertions, 67 deletions

diff --git a/booleancondition.cpp b/booleancondition.cpp
index 8781039..8652e8b 100644
--- a/booleancondition.cpp
+++ b/booleancondition.cpp
@@ -48,7 +48,7 @@ qint64 BooleanCondition::hasValid(Die* b, bool recursive, bool unhighlight) cons
 
     qint64 sum = 0;
     auto valueScalar = valueToScalar();
-    for(qint64 value : listValues)
+    for(qint64& value : listValues)
     {
         switch(m_operator)
         {
@@ -95,7 +95,7 @@ void BooleanCondition::setValueNode(ExecutionNode* v)
 }
 QString BooleanCondition::toString()
 {
-    QString str(QStringLiteral(""));
+    QString str("");
     switch(m_operator)
     {
     case Equal:
diff --git a/compositevalidator.cpp b/compositevalidator.cpp
index 863c94b..2c3dc63 100644
--- a/compositevalidator.cpp
+++ b/compositevalidator.cpp
@@ -40,7 +40,7 @@ qint64 CompositeValidator::hasValid(Die* b,bool recursive,bool unhighlight) cons
     int i = 0;
     qint64 sum = 0;
     bool highLight = false;
-    for(const Validator* validator: *m_validatorList)
+    for(auto& validator: *m_validatorList)
     {
         qint64 val = validator->hasValid(b,recursive,unhighlight);
         if(i==0)
@@ -108,7 +108,7 @@ bool CompositeValidator::isValidRangeSize(std::pair<qint64,qint64> range) const
 {
     bool val = true;
     int i = -1;
-    for(Validator* tmp :*m_validatorList)
+    for(auto& tmp :*m_validatorList)
     {
         bool rel = tmp->isValidRangeSize(range);
         val |= rel;
@@ -132,7 +132,7 @@ Validator* CompositeValidator::getCopy() const
     *vector = *m_operators;
 
     QList<Validator*>* list= new QList<Validator*>();
-    for(auto val : *m_validatorList)
+    for(auto& val : *m_validatorList)
     {
         list->append(val->getCopy());
     }
diff --git a/diceparser.cpp b/diceparser.cpp
index 79e31f5..d3d86a2 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -131,7 +131,7 @@ DiceParser::~DiceParser()
 
 QString DiceParser::convertAlias(QString str)
 {
-    for(DiceAlias* cmd : *m_aliasList)
+    for(auto& cmd : *m_aliasList)
     {
         if(cmd->isEnable())
         {
@@ -155,7 +155,7 @@ void DiceParser::insertAlias(DiceAlias* dice, int i)
 bool DiceParser::parseLine(QString str, bool allowAlias)
 {
     m_errorMap.clear();
-    m_comment = QStringLiteral("");
+    m_comment = QString("");
     if(!m_startNodes.empty())
     {
         qDeleteAll(m_startNodes);
@@ -303,7 +303,10 @@ bool DiceParser::readOperatorFromNull(QString& str,ExecutionNode* & node)
 
 bool DiceParser::readNode(QString& str,ExecutionNode* & node)
 {
-    QString key= str.left(1);
+    if(str.isEmpty())
+        return false;
+
+    QString key= str.at(0);
     if(m_nodeActionMap->contains(key))
     {
         JumpBackwardNode* jumpNode = new JumpBackwardNode();
@@ -406,7 +409,7 @@ QStringList DiceParser::getAllDiceResult(bool& hasAlias)
                 DiceResult* stringResult = dynamic_cast<DiceResult*>(result);
                 if(nullptr!=stringResult)
                 {
-                    for(auto die : stringResult->getResultList())
+                    for(auto& die : stringResult->getResultList())
                     {
                         if(!dieListResult.contains(die))
                         {
@@ -419,11 +422,11 @@ QStringList DiceParser::getAllDiceResult(bool& hasAlias)
             }
             result = result->getPrevious();
         }
-        for(Die* die : dieListResult)
+        for(auto& die : dieListResult)
         {
             if(die->isHighlighted())
             {
-                for(qint64 value : die->getListValue())
+                for(qint64& value : die->getListValue())
                 {
 
                     stringListResult << QString::number(value);
@@ -451,7 +454,7 @@ void DiceParser::getDiceResultFromAllInstruction(QList<ExportedDiceResult>& resu
                 QList<HighLightDice> list;
                 quint64 faces = 0;
 
-                for(Die* die : diceResult->getResultList())
+                for(auto& die : diceResult->getResultList())
                 {
                     faces = die->getFaces();
                     // qDebug() << "face" << faces;
@@ -488,7 +491,7 @@ void DiceParser::getLastDiceResult(QList<ExportedDiceResult>& diceValuesList,boo
                     }
                     quint64 face=0;
                     ListDiceResult listpair;
-                    for(Die* die : diceResult->getResultList())
+                    for(auto& die : diceResult->getResultList())
                     {
                         if(!die->hasBeenDisplayed())
                         {
@@ -498,7 +501,7 @@ void DiceParser::getLastDiceResult(QList<ExportedDiceResult>& diceValuesList,boo
                             face = die->getFaces();
                             if(die->hasChildrenValue())
                             {
-                                for(qint64 i : die->getListValue())
+                                for(qint64& i : die->getListValue())
                                 {
                                     valuesResult.append(i);
                                 }
@@ -594,7 +597,7 @@ QList<qreal> DiceParser::getSumOfDiceResult()
                 DiceResult* myDiceResult = dynamic_cast<DiceResult*>(result);
                 if(nullptr!=myDiceResult)
                 {
-                    for(Die* die : myDiceResult->getResultList())
+                    for(auto& die : myDiceResult->getResultList())
                     {
                         resultValue+=die->getValue();
                     }
@@ -924,10 +927,10 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous)//,
 
     ExecutionNode* node = nullptr;
     bool found=false;
-
-    for(int i = 0; ((i<m_OptionOp->keys().size())&&(!found));++i )
+    auto keys = m_OptionOp->keys();
+    for(int i = 0; ((i<keys.size())&&(!found));++i )
     {
-        QString key =m_OptionOp->keys().at(i);
+        QString key = keys.at(i);
 
         if(str.startsWith(key))
         {
@@ -1254,7 +1257,8 @@ QMap<ExecutionNode::DICE_ERROR_CODE,QString> DiceParser::getErrorMap()
     for(auto start : m_startNodes)
     {
         auto mapTmp = start->getExecutionErrorMap();
-        for(auto key : mapTmp.keys())
+        auto keys = mapTmp.keys();
+        for(auto& key : keys)
         {
             map.insertMulti(key,mapTmp[key]);
         }
diff --git a/diceroller.cpp b/diceroller.cpp
index ff2c5e9..3abbf4f 100644
--- a/diceroller.cpp
+++ b/diceroller.cpp
@@ -57,10 +57,11 @@ void DiceRoller::setCommand(const QString &cmd)
 QString DiceRoller::diceToText(QList<ExportedDiceResult>& diceList)
 {
     QStringList global;
-    for(auto dice : diceList)
+    for(auto& dice : diceList)
     {
         QStringList resultGlobal;
-        for(int face:  dice.keys())
+        auto const& keys = dice.keys();
+        for(auto& face:  keys)
         {
             QStringList result;
             ListDiceResult diceResult =  dice.value(face);
@@ -68,11 +69,10 @@ QString DiceRoller::diceToText(QList<ExportedDiceResult>& diceList)
             {
                 QStringList diceListStr;
                 QStringList diceListChildren;
-                for(int i =0; i < tmp.getResult().size(); ++i)
+                int i = 0;
+                for(qint64& dievalue : tmp.getResult())
                 {
-                    qint64 dievalue = tmp.getResult()[i];
                     QString prefix("%1");
-
                     if(i==0)
                     {
                         diceListStr << prefix.arg(QString::number(dievalue));
@@ -81,6 +81,7 @@ QString DiceRoller::diceToText(QList<ExportedDiceResult>& diceList)
                     {
                         diceListChildren << prefix.arg(QString::number(dievalue));
                     }
+                    ++i;
                 }
                 if(!diceListChildren.isEmpty())
                 {
@@ -89,7 +90,7 @@ QString DiceRoller::diceToText(QList<ExportedDiceResult>& diceList)
                 result << diceListStr.join(' ');
             }
 
-            if(dice.keys().size()>1)
+            if(keys.size()>1)
             {
                 resultGlobal << QString(" d%2:(%1)").arg(result.join(',')).arg(face);
             }
@@ -122,7 +123,7 @@ void DiceRoller::start()
             {
                 auto values = m_diceparser.getLastIntegerResults();
                 QStringList strLst;
-                for(auto val : values )
+                for(auto& val : values )
                 {
                     result += val;
                     strLst << QString::number(val);
diff --git a/node/bind.cpp b/node/bind.cpp
index a179069..9598c45 100644
--- a/node/bind.cpp
+++ b/node/bind.cpp
@@ -45,7 +45,7 @@ void BindNode::run(ExecutionNode* previous)
                 if(nullptr!=dice)
                 {
                     m_diceResult->setHomogeneous(false);
-                    for(Die* die : dice->getResultList())
+                    for(auto& die : dice->getResultList())
                     {
                         if(!die->hasBeenDisplayed())
                         {
diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp
index 205c6d7..d76c115 100644
--- a/node/countexecutenode.cpp
+++ b/node/countexecutenode.cpp
@@ -53,7 +53,7 @@ QString CountExecuteNode::toString(bool withlabel) const
 {
 	if(withlabel)
 	{
-		return QString("%1 [label=\"CountExecuteNode %2\"]").arg(m_id).arg(m_validator->toString());
+        return QString("%1 [label=\"CountExecuteNode %2\"]").arg(m_id,m_validator->toString());
 	}
 	else
 	{
diff --git a/node/executionnode.cpp b/node/executionnode.cpp
index d8e21a3..5b001fb 100644
--- a/node/executionnode.cpp
+++ b/node/executionnode.cpp
@@ -41,7 +41,8 @@ QMap<ExecutionNode::DICE_ERROR_CODE,QString> ExecutionNode::getExecutionErrorMap
 {
     if(nullptr!=m_nextNode)
     {
-        for(ExecutionNode::DICE_ERROR_CODE key: m_nextNode->getExecutionErrorMap().keys())
+        auto const& keys =  m_nextNode->getExecutionErrorMap().keys();
+        for(auto& key: keys)
         {
             m_errors.insert(key,m_nextNode->getExecutionErrorMap().value(key));
         }
diff --git a/node/explodedicenode.cpp b/node/explodedicenode.cpp
index b151de8..210f042 100644
--- a/node/explodedicenode.cpp
+++ b/node/explodedicenode.cpp
@@ -14,7 +14,7 @@ void ExplodeDiceNode::run(ExecutionNode* previous)
         m_result->setPrevious(previous_result);
         if(nullptr!=previous_result)
         {
-            for(Die* die: previous_result->getResultList())
+            for(auto& die: previous_result->getResultList())
             {
                 Die* tmpdie = new Die();
                 *tmpdie=*die;
@@ -24,7 +24,7 @@ void ExplodeDiceNode::run(ExecutionNode* previous)
 
             QList<Die*> list = m_diceResult->getResultList();
 
-            for(Die* die: list)
+            for(auto& die: list)
             {
                 while(m_validator->hasValid(die,false))
                 {
@@ -55,7 +55,7 @@ QString ExplodeDiceNode::toString(bool withlabel) const
 {
 	if(withlabel)
 	{
-		return QString("%1 [label=\"ExplodeDiceNode %2\"]").arg(m_id).arg(m_validator->toString());
+        return QString("%1 [label=\"ExplodeDiceNode %2\"]").arg(m_id, m_validator->toString());
 	}
 	else
 	{
diff --git a/node/groupnode.cpp b/node/groupnode.cpp
index c5b141d..a0bce3a 100644
--- a/node/groupnode.cpp
+++ b/node/groupnode.cpp
@@ -78,7 +78,7 @@ void GroupNode::run(ExecutionNode* previous)
             {
                 auto list = dice->getResultList();
                 DieGroup allResult;
-                for(Die* die : dice->getResultList())
+                for(auto& die : list)
                 {
                     allResult << die->getListValue();
                 }
diff --git a/node/helpnode.cpp b/node/helpnode.cpp
index 25efdcd..969c1cf 100644
--- a/node/helpnode.cpp
+++ b/node/helpnode.cpp
@@ -107,7 +107,7 @@ QString HelpNode::toString(bool wl) const
 {
       if(wl)
       {
-              return QString("%1 [label=\"Rolisteam Dice Parser:\nFull documentation at: %2\"]").arg(m_id).arg(m_path);
+              return QString("%1 [label=\"Rolisteam Dice Parser:\nFull documentation at: %2\"]").arg(m_id, m_path);
       }
       else
       {
diff --git a/node/jumpbackwardnode.cpp b/node/jumpbackwardnode.cpp
index 2ca8874..2f04bb8 100644
--- a/node/jumpbackwardnode.cpp
+++ b/node/jumpbackwardnode.cpp
@@ -130,7 +130,7 @@ void JumpBackwardNode::run(ExecutionNode* previous)
             DiceResult* diceResult = dynamic_cast<DiceResult*>(result);
             if(nullptr!=diceResult)
             {
-                for(Die* die:diceResult->getResultList())
+                for(auto& die : diceResult->getResultList())
                 {
                     Die* tmpdie = new Die();
                     *tmpdie=*die;
diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp
index dbd1591..40fd227 100644
--- a/node/keepdiceexecnode.cpp
+++ b/node/keepdiceexecnode.cpp
@@ -69,7 +69,7 @@ void KeepDiceExecNode::run(ExecutionNode* previous)
             m_errors.insert(TOO_MANY_DICE,QObject::tr(" You ask to keep %1 dice but the result only has %2").arg(m_numberOfDice).arg(diceList.size()));
         }
 
-        for(Die* tmp : diceList.mid(static_cast<int>(m_numberOfDice),-1))
+        for(auto& tmp : diceList.mid(static_cast<int>(m_numberOfDice),-1))
         {
             tmp->setHighlighted(false);
         }
diff --git a/node/listaliasnode.cpp b/node/listaliasnode.cpp
index a3d2d09..a15bfbc 100644
--- a/node/listaliasnode.cpp
+++ b/node/listaliasnode.cpp
@@ -46,25 +46,23 @@ void ListAliasNode::run(ExecutionNode* previous )
 QString ListAliasNode::buildList() const
 {
 	QString result(QObject::tr("List of Alias:\n"));
-    for(DiceAlias* key: *m_aliasList)
+    for(auto& key: *m_aliasList)
 	{
-        result+=QString("%1 : %2  # %3\n").arg(key->getCommand())
-                                         .arg(key->getValue())
-                                         .arg(key->getComment());
+        result+=QString("%1 : %2  # %3\n").arg(key->getCommand(),key->getValue(),key->getComment());
 	}
 	return result;
 }
 QString ListAliasNode::toString(bool wl) const
 {
 	QStringList resultList;
-    for(DiceAlias* key: *m_aliasList)
+    for(auto& key: *m_aliasList)
 	{
 		resultList <<  "{" <<key->getCommand() << key->getValue()<<  "}";
 	}
 
 	if(wl)
 	{
-		return QString("%1 [label=\"ListAliasNode %2\"]").arg(m_id).arg(resultList.join(","));
+        return QString("%1 [label=\"ListAliasNode %2\"]").arg(m_id, resultList.join(","));
 	}
 	else
 	{
diff --git a/node/listsetrollnode.cpp b/node/listsetrollnode.cpp
index eca6168..8771866 100644
--- a/node/listsetrollnode.cpp
+++ b/node/listsetrollnode.cpp
@@ -43,7 +43,7 @@ QString ListSetRollNode::toString(bool wl) const
 {
 	if(wl)
 	{
-		return QString("%1 [label=\"ListSetRoll list:%2\"]").arg(m_id).arg(m_values.join(","));
+        return QString("%1 [label=\"ListSetRoll list:%2\"]").arg(m_id,m_values.join(","));
 	}
 	else
 	{
@@ -113,7 +113,7 @@ void ListSetRollNode::computeFacesNumber(Die* die)
         Q_ASSERT(m_values.size() == m_rangeList.size());
         qint64 max;
         int i=0;
-        for(Range range: m_rangeList)
+        for(Range& range: m_rangeList)
         {
             if(((i==0)||(max<range.getEnd()))&&(range.isFullyDefined()))
             {
diff --git a/node/mergenode.cpp b/node/mergenode.cpp
index f808854..c79521b 100644
--- a/node/mergenode.cpp
+++ b/node/mergenode.cpp
@@ -52,7 +52,7 @@ void MergeNode::run(ExecutionNode* previous)
                 {
                     ///@todo TODO improve here to set homogeneous while is really
                     m_diceResult->setHomogeneous(false);
-                    for(Die* die : dice->getResultList())
+                    for(auto& die : dice->getResultList())
                     {
                         if(!m_diceResult->getResultList().contains(die)&&(!die->hasBeenDisplayed()))
                         {
diff --git a/node/paintnode.cpp b/node/paintnode.cpp
index ddd19de..79aee60 100644
--- a/node/paintnode.cpp
+++ b/node/paintnode.cpp
@@ -78,7 +78,7 @@ void PainterNode::run(ExecutionNode* previous)
     {
         QList<Die*> diceList=previousDiceResult->getResultList();
         int pastDice=0;
-        for(ColorItem item:m_colors)
+        for(ColorItem& item : m_colors)
         {
             int current=item.colorNumber();
             QList<Die*>::iterator it;
diff --git a/node/rerolldicenode.cpp b/node/rerolldicenode.cpp
index 3f0228c..471404e 100644
--- a/node/rerolldicenode.cpp
+++ b/node/rerolldicenode.cpp
@@ -26,7 +26,7 @@ void RerollDiceNode::run(ExecutionNode* previous)
         m_result->setPrevious(previous_result);
         if(nullptr!=previous_result)
         {
-            for(Die* die: previous_result->getResultList())
+            for(auto& die: previous_result->getResultList())
             {
                 Die* tmpdie = new Die();
                 *tmpdie=*die;
@@ -96,7 +96,7 @@ QString RerollDiceNode::toString(bool wl) const
 {
 	if(wl)
 	{
-		return QString("%1 [label=\"RerollDiceNode validatior: %2\"]").arg(m_id).arg(m_validator->toString());
+        return QString("%1 [label=\"RerollDiceNode validatior: %2\"]").arg(m_id, m_validator->toString());
 	}
 	else
 	{
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp
index 8172de7..d73f066 100644
--- a/node/scalaroperatornode.cpp
+++ b/node/scalaroperatornode.cpp
@@ -174,7 +174,7 @@ QString ScalarOperatorNode::toString(bool wl) const
     }
     if(wl)
     {
-        return QString("%1 [label=\"ScalarOperatorNode %2\"]").arg(m_id).arg(op);
+        return QString("%1 [label=\"ScalarOperatorNode %2\"]").arg(m_id, op);
     }
     else
     {
@@ -241,14 +241,16 @@ QMap<ExecutionNode::DICE_ERROR_CODE,QString> ScalarOperatorNode::getExecutionErr
 {
     if(nullptr!=m_internalNode)
     {
-        for (ExecutionNode::DICE_ERROR_CODE key: m_internalNode->getExecutionErrorMap().keys())
+        auto keys = m_internalNode->getExecutionErrorMap().keys();
+        for (ExecutionNode::DICE_ERROR_CODE& key: keys)
         {
             m_errors.insert(key,m_internalNode->getExecutionErrorMap().value(key));
         }
     }
     if(nullptr!=m_nextNode)
     {
-        for (ExecutionNode::DICE_ERROR_CODE key: m_nextNode->getExecutionErrorMap().keys())
+        auto keys = m_nextNode->getExecutionErrorMap().keys();
+        for (ExecutionNode::DICE_ERROR_CODE& key: keys)
         {
             m_errors.insert(key,m_nextNode->getExecutionErrorMap().value(key));
         }
diff --git a/node/sortresult.cpp b/node/sortresult.cpp
index 76f517e..69611df 100644
--- a/node/sortresult.cpp
+++ b/node/sortresult.cpp
@@ -129,7 +129,8 @@ QString SortResultNode::toString(bool wl) const
 {
 	if(wl)
 	{
-		return QString("%1 [label=\"SortResultNode %2\"]").arg(m_id).arg(m_ascending ? "Ascending":"Descending");
+        auto order = m_ascending ? QStringLiteral("Ascending") : QStringLiteral("Descending");
+        return QString("%1 [label=\"SortResultNode %2\"]").arg(m_id, order);
 	}
 	else
 	{
diff --git a/node/splitnode.cpp b/node/splitnode.cpp
index d44bad5..4ef9c8c 100644
--- a/node/splitnode.cpp
+++ b/node/splitnode.cpp
@@ -39,11 +39,11 @@ void SplitNode::run(ExecutionNode* previous)
             DiceResult* dice = dynamic_cast<DiceResult*>(tmpResult);
             if(nullptr!=dice)
             {
-                for(Die* oldDie : dice->getResultList())
+                for(auto& oldDie : dice->getResultList())
                 {
                     oldDie->displayed();
                     m_diceResult->setOperator(oldDie->getOp());
-                    for(qint64 value : oldDie->getListValue())
+                    for(qint64& value : oldDie->getListValue())
                     {
                         Die* tmpdie = new Die();
                         tmpdie->insertRollValue(value);
diff --git a/node/stringnode.cpp b/node/stringnode.cpp
index 5c489be..8f9796d 100644
--- a/node/stringnode.cpp
+++ b/node/stringnode.cpp
@@ -30,7 +30,7 @@ QString StringNode::toString(bool withLabel) const
     {
         QString dataCopy = m_data;
 
-        return QString("%1 [label=\"StringNode %2\"]").arg(m_id).arg(dataCopy.replace('%','\\'));
+        return QString("%1 [label=\"StringNode %2\"]").arg(m_id, dataCopy.replace('%','\\'));
     }
     else
     {
diff --git a/operationcondition.cpp b/operationcondition.cpp
index 6b4e819..3949799 100644
--- a/operationcondition.cpp
+++ b/operationcondition.cpp
@@ -57,7 +57,7 @@ qint64 OperationCondition::hasValid(Die* b,bool recursive,bool unhighlight) cons
     }
 
     qint64 sum= 0;
-    for(qint64 value: listValues)
+    for(qint64& value: listValues)
     {
         switch(m_operator)
         {
@@ -99,7 +99,7 @@ void OperationCondition::setValueNode(ExecutionNode *node)
 
 QString OperationCondition::toString()
 {
-    QString str(QStringLiteral(""));
+    QString str("");
     switch (m_operator)
     {
     case Modulo:
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 3c2afe5..9b6c37f 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -105,7 +105,8 @@ ExecutionNode* ParsingToolBox::addSort(ExecutionNode* e,bool b)
 bool ParsingToolBox::readDiceLogicOperator(QString& str,OperationCondition::ConditionOperator& op)
 {
     QString longKey;
-    for(const QString& tmp: m_conditionOperation->keys())
+    auto const& keys = m_conditionOperation->keys();
+    for(const QString& tmp: keys)
     {
         if(str.startsWith(tmp))
         {
@@ -145,7 +146,8 @@ bool ParsingToolBox::readArithmeticOperator(QString &str, Die::ArithmeticOperato
 bool ParsingToolBox::readLogicOperator(QString& str,BooleanCondition::LogicOperator& op)
 {
     QString longKey;
-    for(const QString& tmp: m_logicOp->keys())
+    auto const& keys = m_logicOp->keys();
+    for(const QString& tmp: keys)
     {
         if(str.startsWith(tmp))
         {
@@ -332,7 +334,8 @@ Validator* ParsingToolBox::readCompositeValidator(QString& str)
 bool ParsingToolBox::readLogicOperation(QString& str,CompositeValidator::LogicOperation& op)
 {
     QString longKey;
-    for(auto const& tmp : m_logicOperation->keys())
+    auto const& keys = m_logicOperation->keys();
+    for(auto& tmp : keys)
     {
         if(str.startsWith(tmp))
         {
@@ -674,7 +677,7 @@ void ParsingToolBox::readPainterParameter(PainterNode* painter,QString& str)
             QString data = str.left(pos);
             str=str.remove(0,pos+1);
             QStringList duos = data.split(',');
-            for(QString duoStr: duos)
+            for(QString& duoStr: duos)
             {
                 QStringList keyValu = duoStr.split(':');
                 if(keyValu.size()==2)
diff --git a/range.cpp b/range.cpp
index 867bb61..7dd01be 100644
--- a/range.cpp
+++ b/range.cpp
@@ -41,7 +41,7 @@ qint64 Range::hasValid(Die* m,bool recursive, bool unhighlight) const
     qint64 result = 0;
     if(recursive)
     {
-        for(qint64 value : m->getListValue())
+        for(qint64& value : m->getListValue())
         {
             if((value>=m_start)&&(value<=m_end))
             {
diff --git a/result/diceresult.cpp b/result/diceresult.cpp
index c1089dd..9f6f913 100644
--- a/result/diceresult.cpp
+++ b/result/diceresult.cpp
@@ -80,7 +80,7 @@ QVariant DiceResult::getResult(RESULT_TYPE type)
 }
 bool DiceResult::contains(Die* die, const std::function<bool(const Die*,const Die*)> equal)
 {
-    for(auto value : m_diceValues)
+    for(auto& value : m_diceValues)
     {
         if(equal(value,die))
         {
@@ -99,7 +99,7 @@ qreal DiceResult::getScalarResult()
     {
         qint64 scalar=0;
         int i = 0;
-        for(auto tmp : m_diceValues)
+        for(auto& tmp : m_diceValues)
         {
             if(i>0)
             {
@@ -157,13 +157,13 @@ void DiceResult::setOperator(const Die::ArithmeticOperator& dieOperator)
 QString DiceResult::toString(bool wl)
 {
     QStringList scalarSum;
-    for(auto die : m_diceValues)
+    for(auto& die : m_diceValues)
     {
         scalarSum << QString::number(die->getValue());
     }
     if(wl)
     {
-		return QStringLiteral("%3 [label=\"DiceResult Value %1 dice %2\"]").arg(getScalarResult()).arg(scalarSum.join('_')).arg(m_id);
+        return QStringLiteral("%3 [label=\"DiceResult Value %1 dice %2\"]").arg(QString::number(getScalarResult()), scalarSum.join('_'), m_id);
 	}
 	else
 	{
diff --git a/result/stringresult.cpp b/result/stringresult.cpp
index f0ff699..2858155 100644
--- a/result/stringresult.cpp
+++ b/result/stringresult.cpp
@@ -51,7 +51,7 @@ QString StringResult::toString(bool wl)
 {
 	if(wl)
 	{
-		return QString("%2 [label=\"StringResult_value_%1\"]").arg(getText().replace("%","_")).arg(m_id);
+        return QString("%2 [label=\"StringResult_value_%1\"]").arg(getText().replace("%","_"), m_id);
 	}
 	else
 	{