Merge branch 'rangeInList'

resolved conflicts and merge rangeInList in master.

Conflicts:
	HelpMe.md
	diceparser.cpp
	parsingtoolbox.cpp
	result/result.cpp
	result/stringresult.h

1 files changed, 9 insertions, 2 deletions

diff --git a/range.h b/range.h
index e50a48e..f9849ce 100644
--- a/range.h
+++ b/range.h
@@ -33,15 +33,22 @@ class Range : public Validator
 public:
     Range();
     void setValue(qint64,qint64);
-
+    void setStart(qint64);
+    void setEnd(qint64);
     virtual qint64 hasValid(Die* b,bool recursive,bool unlight = false) const;
 
     virtual QString toString();
-    virtual quint8 getValidRangeSize(quint64 faces) const;
+    virtual quint64 getValidRangeSize(quint64 faces) const;
+
+    bool isFullyDefined();
+    qint64 getStart() const;
+    qint64 getEnd() const;
 
 private:
     qint64 m_start;
     qint64 m_end;
+    bool m_hasEnd;
+    bool m_hasStart;
 };
 
 #endif // RANGE_H