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,7 +24,7 @@
 ///
 /// Constructor
 ///
-Merge::Merge( SourceType type )	: mType(type)
+Merge::Merge()
 {
 }

@@ -32,7 +32,7 @@ Merge::Merge( SourceType type )	: mType(type)
 ///
 /// Constructor
 ///
-Merge::Merge( const Merge* merge ) : mType(merge->mType), mSource(merge->mSource)
+Merge::Merge( const Merge* merge ) : mSource(merge->mSource)
 {
 	foreach ( MergeRecord* record, merge->mRecordList )
 	{
@@ -55,11 +55,11 @@ Merge::~Merge()


 ///
-/// Get type
+/// Get id
 ///
-Merge::SourceType Merge::type() const
+QString Merge::id() const
 {
-	return mType;
+	return mId;
 }