Merge branch 'master' of github.com:Rolisteam/DiceParser

3 files changed, 15 insertions, 1 deletions

diff --git a/result/result.cpp b/result/result.cpp
index 257045c..161cfea 100644
--- a/result/result.cpp
+++ b/result/result.cpp
@@ -22,7 +22,7 @@
 #include "result.h"
 
 Result::Result()
-    : m_previous(NULL)
+    : m_previous(NULL),m_resultTypes(STRING)
 {
 }
 
diff --git a/result/stringresult.cpp b/result/stringresult.cpp
index 4dbd577..474ae23 100644
--- a/result/stringresult.cpp
+++ b/result/stringresult.cpp
@@ -2,6 +2,7 @@
 
 StringResult::StringResult()
 {
+    m_highlight = true;
     m_resultTypes = Result::STRING;
 }
 void StringResult::setText(QString text)
@@ -35,3 +36,12 @@ QString StringResult::toString()
 {
     return QString("StringResult_value_%1").arg(getText().replace(" ","_"));
 }
+void StringResult::setHighLight(bool b)
+{
+    m_highlight = b;
+}
+
+bool StringResult::hasHighLight() const
+{
+    return m_highlight;
+}
diff --git a/result/stringresult.h b/result/stringresult.h
index 5a6b26c..6819aaa 100644
--- a/result/stringresult.h
+++ b/result/stringresult.h
@@ -37,8 +37,12 @@ public:
      * @return
      */
     virtual QString toString();
+
+    virtual void setHighLight(bool );
+    virtual bool hasHighLight() const;
 private:
     QString m_value;
+    bool m_highlight;
 };
 
 #endif // STRINGRESULT_H