From 80ff2a99b45a25695321cc84a30a3fbf3b797d54 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Sat, 10 Oct 2015 17:12:45 +0200
Subject: Add way to disable alias.

---
 dicealias.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'dicealias.cpp')

diff --git a/dicealias.cpp b/dicealias.cpp
index f9c366c..3e6dc8f 100644
--- a/dicealias.cpp
+++ b/dicealias.cpp
@@ -22,8 +22,10 @@
 #include "dicealias.h"
 #include <QRegularExpression>
 
-DiceAlias::DiceAlias(QString cmd, QString key, bool isReplace)
-    : m_command(cmd),m_value(key)
+#include <QDebug>
+
+DiceAlias::DiceAlias(QString cmd, QString key, bool isReplace,bool isEnable)
+    : m_command(cmd),m_value(key),m_isEnable(isEnable)
 {
     if(isReplace)
     {
@@ -42,6 +44,9 @@ DiceAlias::~DiceAlias()
 
 bool DiceAlias::resolved(QString & str)
 {
+    if(!m_isEnable)
+        return false;
+
     if((m_type == REPLACE)&&(str.contains(m_command)))
     {
        str.replace(m_command,m_value);
@@ -97,3 +102,13 @@ void DiceAlias::setReplace(bool b)
         m_type = REGEXP;
     }
 }
+
+bool DiceAlias::isEnable()
+{
+    return m_isEnable;
+}
+
+void DiceAlias::setEnable(bool b)
+{
+    m_isEnable = b;
+}
-- 
cgit v1.2.3-70-g09d2


From 5cd822edaeebae07450ae3735bd2aaf7a4d28103 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Sat, 21 Nov 2015 00:25:36 +0100
Subject: add const

---
 dicealias.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dicealias.cpp')

diff --git a/dicealias.cpp b/dicealias.cpp
index 3e6dc8f..84c06d8 100644
--- a/dicealias.cpp
+++ b/dicealias.cpp
@@ -103,7 +103,7 @@ void DiceAlias::setReplace(bool b)
     }
 }
 
-bool DiceAlias::isEnable()
+bool DiceAlias::isEnable() const
 {
     return m_isEnable;
 }
-- 
cgit v1.2.3-70-g09d2


From 6a1a9f1c7f3c50d04d89cc54e93d08ed6f2c4cc2 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Fri, 8 Jan 2016 20:12:38 +0100
Subject: -Fix cppcheck errors.

---
 compositevalidator.cpp | 1 +
 dicealias.cpp          | 6 +++---
 dicealias.h            | 6 +++---
 diceparser.cpp         | 3 +--
 diceparser.h           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'dicealias.cpp')

diff --git a/compositevalidator.cpp b/compositevalidator.cpp
index cc52fdd..167c73b 100644
--- a/compositevalidator.cpp
+++ b/compositevalidator.cpp
@@ -23,6 +23,7 @@
 
 
 CompositeValidator::CompositeValidator()
+    : m_operators(NULL),m_validatorList(NULL)
 {
 }
 qint64 CompositeValidator::hasValid(Die* b,bool recursive,bool unhighlight) const
diff --git a/dicealias.cpp b/dicealias.cpp
index 84c06d8..59e8d69 100644
--- a/dicealias.cpp
+++ b/dicealias.cpp
@@ -75,17 +75,17 @@ void DiceAlias::setType(RESOLUTION_TYPE type)
 {
     m_type = type;
 }
-QString DiceAlias::getCommand()
+QString DiceAlias::getCommand() const
 {
     return m_command;
 }
 
-QString DiceAlias::getValue()
+QString DiceAlias::getValue() const
 {
     return m_value;
 }
 
-bool DiceAlias::isReplace()
+bool DiceAlias::isReplace() const
 {
     return (m_type == REPLACE) ? true : false;
 }
diff --git a/dicealias.h b/dicealias.h
index c902957..189b0f9 100644
--- a/dicealias.h
+++ b/dicealias.h
@@ -67,17 +67,17 @@ public:
      * @brief getCommand
      * @return
      */
-    QString getCommand();
+    QString getCommand() const;
     /**
      * @brief getValue
      * @return
      */
-    QString getValue();
+    QString getValue() const;
     /**
      * @brief isReplace
      * @return
      */
-    bool isReplace();
+    bool isReplace() const;
     /**
      * @brief setReplace
      */
diff --git a/diceparser.cpp b/diceparser.cpp
index 53dc305..86fbc09 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -499,7 +499,7 @@ void DiceParser::getLastDiceResult(ExportedDiceResult& diceValues)
         result = result->getPrevious();
     }
 }
-QString DiceParser::getDiceCommand()
+QString DiceParser::getDiceCommand() const
 {
     return m_command;
 }
@@ -701,7 +701,6 @@ bool DiceParser::readInstructionOperator(QChar c)
         return true;
     }
     return false;
-
 }
 
 bool DiceParser::readOperator(QString& str,ExecutionNode* previous)
diff --git a/diceparser.h b/diceparser.h
index 6b9056f..9ef2327 100644
--- a/diceparser.h
+++ b/diceparser.h
@@ -150,7 +150,7 @@ public:
      * @brief getDiceCommand
      * @return
      */
-    QString getDiceCommand();
+    QString getDiceCommand() const;
     /**
      * @brief hasStringResult
      * @return
-- 
cgit v1.2.3-70-g09d2