From bc8f5cdeb2643941688f567762f7e37a4c1d97f7 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Wed, 6 Apr 2022 09:29:17 +0800
Subject: [PATCH] Merge fix

---
 src/DateSelectDialog.h                | 2 +-
 src/EditPatientDialog.cpp             | 2 +-
 src/EditPatientDialog.h               | 4 ++--
 src/forms/select/SelectFormWidget.cpp | 2 +-
 src/forms/select/SelectFormWidget.h   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/DateSelectDialog.h b/src/DateSelectDialog.h
index 4132302..0c70a55 100644
--- a/src/DateSelectDialog.h
+++ b/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
diff --git a/src/EditPatientDialog.cpp b/src/EditPatientDialog.cpp
index 7724b0b..94802a9 100644
--- a/src/EditPatientDialog.cpp
+++ b/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"
 
diff --git a/src/EditPatientDialog.h b/src/EditPatientDialog.h
index cc2eaa3..d045df8 100644
--- a/src/EditPatientDialog.h
+++ b/src/EditPatientDialog.h
@@ -5,8 +5,8 @@
 #ifndef GUI_EDITPATIENTDIALOG_H
 #define GUI_EDITPATIENTDIALOG_H
 
-#include "GUIFormBaseDialog.h"
-#include "editpatientform.h"
+#include "dialogs/GUIFormBaseDialog.h"
+#include "forms/select/editpatientform.h"
 
 class QLineEdit;
 class QTextEdit;
diff --git a/src/forms/select/SelectFormWidget.cpp b/src/forms/select/SelectFormWidget.cpp
index 3bf3e95..3a4a50b 100644
--- a/src/forms/select/SelectFormWidget.cpp
+++ b/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>
 
diff --git a/src/forms/select/SelectFormWidget.h b/src/forms/select/SelectFormWidget.h
index 3b77ef6..1c0ddd1 100644
--- a/src/forms/select/SelectFormWidget.h
+++ b/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;