More fleshing out of merge framework.

2016-05-08 00:43:35 -04:00
parent 88e32d9738
commit 37358aac43
13 changed files with 193 additions and 37 deletions
@@ -24,8 +24,9 @@
 ///
 /// Constructor
 ///
-MergeNone::MergeNone() : Merge( Merge::NONE )
+MergeNone::MergeNone() : Merge()
 {
+	mId = "None";
 }


@@ -54,6 +55,15 @@ MergeNone* MergeNone::clone() const
 }


+///
+/// Get ID
+///
+QString MergeNone::id()
+{
+	return "None";
+}
+
+
 ///
 /// Create
 ///