Merge branch 'newBranch'

Conflicts:
	dicealias.cpp
	dicealias.h

1 files changed, 9 insertions, 2 deletions

diff --git a/dicealias.h b/dicealias.h
index a76d47a..c902957 100644
--- a/dicealias.h
+++ b/dicealias.h
@@ -83,8 +83,15 @@ public:
      */
     void setReplace(bool);
 
-    bool isEnable();
-
+    /**
+     * @brief isEnable
+     * @return
+     */
+    bool isEnable() const;
+    /**
+     * @brief setEnable
+     * @param b
+     */
     void setEnable(bool b);
 private:
     QString m_command;