Merge fix

src/DateSelectDialog.h

@@ -5,7 +5,7 @@
 #ifndef GUI_DATESELECTDIALOG_H
 #define GUI_DATESELECTDIALOG_H
 
-#include "GUIFormBaseDialog.h"
+#include "dialogs/GUIFormBaseDialog.h"
 class DateSlidePickerBox;
 class DateSelectDialog:public  GUIFormBaseDialog{
     Q_OBJECT

src/EditPatientDialog.cpp

@@ -10,7 +10,7 @@
 #include <QSqlTableModel>
 #include <QUuid>
 #include "EditPatientDialog.h"
-#include "SelectDialog.h"
+#include "dialogs/SelectDialog.h"
 #include "DateSelectDialog.h"
 #include "components/Listbox.h"
 

src/EditPatientDialog.h

@@ -5,8 +5,8 @@
 #ifndef GUI_EDITPATIENTDIALOG_H
 #define GUI_EDITPATIENTDIALOG_H
 
-#include "GUIFormBaseDialog.h"
+#include "dialogs/GUIFormBaseDialog.h"
-#include "editpatientform.h"
+#include "forms/select/editpatientform.h"
 
 class QLineEdit;
 class QTextEdit;

src/forms/select/SelectFormWidget.cpp

@@ -19,7 +19,7 @@
 #include "log/UserOperationLog.h"
 #include <QSortFilterProxyModel>
 #include "src/components/VerticalTextToolButton.h"
-#include "AlertDialog.h"
+#include "dialogs/AlertDialog.h"
 
 #include <QScroller>
 

src/forms/select/SelectFormWidget.h

@@ -6,7 +6,7 @@
 #define GUI_SELECTFORMWIDGET_H
 
 
-#include "tabformwidget.h"
+#include "forms/tabformwidget.h"
 #include "EditPatientDialog.h"
 class EditPatientForm;
 class SlideableTableView;