Some fleshing out of MergeView.

This commit is contained in:
Jim Evins
2016-05-10 23:59:57 -04:00
parent 37358aac43
commit 8b56520fed
13 changed files with 175 additions and 29 deletions
+3 -1
View File
@@ -23,6 +23,7 @@
#include "Merge.h"
#include <QCoreApplication>
#include <QStringList>
///
@@ -55,9 +56,10 @@ public:
static Merge* createMerge( const QString& id );
static QList<QString> nameList();
static QStringList nameList();
static QString idToName( const QString& id );
static QString nameToId( const QString& name );
static SourceType idToType( const QString& id );
/////////////////////////////////