merge MergeOp into master

1 files changed, 20 insertions, 5 deletions

diff --git a/dicealias.cpp b/dicealias.cpp
index f9c366c..59e8d69 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);
@@ -70,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;
 }
@@ -97,3 +102,13 @@ void DiceAlias::setReplace(bool b)
         m_type = REGEXP;
     }
 }
+
+bool DiceAlias::isEnable() const
+{
+    return m_isEnable;
+}
+
+void DiceAlias::setEnable(bool b)
+{
+    m_isEnable = b;
+}