merge MergeOp into master

1 files changed, 16 insertions, 4 deletions

diff --git a/dicealias.h b/dicealias.h
index 5acca46..189b0f9 100644
--- a/dicealias.h
+++ b/dicealias.h
@@ -37,7 +37,7 @@ public:
      * @param key
      * @param isReplace
      */
-    DiceAlias(QString cmd, QString key, bool isReplace = true);
+    DiceAlias(QString cmd, QString key, bool isReplace = true, bool isEnable = true);
     /**
      * @brief ~DiceAlias
      */
@@ -67,25 +67,37 @@ 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
      */
     void setReplace(bool);
+
+    /**
+     * @brief isEnable
+     * @return
+     */
+    bool isEnable() const;
+    /**
+     * @brief setEnable
+     * @param b
+     */
+    void setEnable(bool b);
 private:
     QString m_command;
     QString m_value;
     RESOLUTION_TYPE m_type;
+    bool m_isEnable;
 
 };