Restructuring directory layout. Move towards "Modern CMake" usage.

2017-11-23 22:15:24 -05:00
parent 8bec3594ec
commit b8ee5e1f73
198 changed files with 4509 additions and 5324 deletions
@@ -20,9 +20,7 @@

 #include "MergeView.h"

-#include "LabelModel.h"
-
-#include "Merge/Factory.h"
+#include "merge/Factory.h"

 #include <QFileDialog>
 #include <QFileInfo>
@@ -59,7 +57,7 @@ namespace glabels
 	///
 	/// Set Model
 	///
-	void MergeView::setModel( LabelModel* model, UndoRedoModel* undoRedoModel )
+	void MergeView::setModel( model::Model* model, UndoRedoModel* undoRedoModel )
 	{
 		mModel = model;
 		mUndoRedoModel = undoRedoModel;