Some fleshing out of MergeView.

2016-05-10 23:59:57 -04:00
parent 37358aac43
commit 8b56520fed
13 changed files with 175 additions and 29 deletions
@@ -33,7 +33,7 @@ struct MergeNone : public Merge
 	/////////////////////////////////
 	// Life Cycle
 	/////////////////////////////////
-protected:
+public:
 	MergeNone();
 	MergeNone( const MergeNone* merge );
 	virtual ~MergeNone();
@@ -57,7 +57,7 @@ public:
 	// Implementation of virtual methods
 	/////////////////////////////////
 public:
-	QList<QString> keyList() const;
+	QStringList keyList() const;
 	QString primaryKey() const;
 protected:
 	void open();