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
@@ -36,19 +36,13 @@ struct Merge : QObject
 	Q_OBJECT


-	/////////////////////////////////
-	// Source Type
-	/////////////////////////////////
-public:
-	enum SourceType { NONE, FIXED, FILE };
-		
-		
 	/////////////////////////////////
 	// Life Cycle
 	/////////////////////////////////
 protected:
-	Merge( SourceType type );
+	Merge();
 	Merge( const Merge* merge );
+public:
 	virtual ~Merge();


@@ -62,7 +56,7 @@ protected:
 	// Properties
 	/////////////////////////////////
 public:
-	SourceType type() const;
+	QString id() const;
 	QString source() const;
 	void setSource( const QString& source );

@@ -103,9 +97,9 @@ signals:
 	/////////////////////////////////
 	// Private data
 	/////////////////////////////////
+protected:
+	QString             mId;
 private:
-	SourceType          mType;
-
 	QString             mSource;
 	QList<MergeRecord*> mRecordList;
 };