File arrangement

src/UserOperationLogForm.cpp

@@ -13,8 +13,8 @@
 #include <QTableView>
 #include "components/SlideableTableView.h"
 #include <QPushButton>
-#include "SelectDialog.h"
-#include "mainwindow.h"
+#include "src/dialogs/SelectDialog.h"
+#include "src/windows/mainwindow.h"
 #include "event/EventCenter.h"
 QString fileNameToDate(QString fileName)
 {

src/forms/scan/ScanFormWidget.cpp

@@ -8,7 +8,7 @@
 #include <QToolButton>
 #include "ui_tabformwidget.h"
 #include "guimacros.h"
-#include "patientinformationform.h"
+#include "src/forms/scan/patientinformationform.h"
 #include <QButtonGroup>
 #include "event/EventCenter.h"
 #include <QImage>

src/forms/scan/ScanFormWidget.h

@@ -5,7 +5,7 @@
 #ifndef GUI_SCANFORMWIDGET_H
 #define GUI_SCANFORMWIDGET_H
 
-#include "tabformwidget.h"
+#include "src/forms/tabformwidget.h"
 #include <functional>
 class PatientInformationForm;
 class ScanFormWidget :public TabFormWidget {

src/forms/scan/patientinformationform.h

@@ -2,7 +2,7 @@
 #define PATIENTINFORMATIONFORM_H
 
 #include <QWidget>
-#include "editpatientform.h"
+#include "src/forms/select/editpatientform.h"
 namespace Ui {
 class PatientInformationForm;
 }

src/forms/select/SelectFormWidget.cpp

@@ -14,7 +14,7 @@
 #include "editpatientform.h"
 #include "guimacros.h"
 #include "event/EventCenter.h"
-#include "AccountFormDialog.h"
+#include "src/dialogs/AccountFormDialog.h"
 #include <QDebug>
 #include "log/UserOperationLog.h"
 #include <QSortFilterProxyModel>

src/forms/settings/AccountTableForm.cpp

@@ -9,12 +9,12 @@
 #include <QHeaderView>
 #include "components/AccountRoleComboDelegate.h"
 #include "guimacros.h"
-#include "AlertDialog.h"
+#include "src/dialogs/AlertDialog.h"
 #include "db/SQLHelper.h"
 #include "models/User.h"
 #include <QSqlRecord>
 #include "components/SlideableTableView.h"
-#include "AccountFormDialog.h"
+#include "src/dialogs/AccountFormDialog.h"
 #include "event/EventCenter.h"
 AccountTableForm::AccountTableForm(QWidget* parent) {
 	layout = new QVBoxLayout(this);

src/forms/settings/AdminSettingForm.cpp

@@ -7,7 +7,7 @@
 #include <QStackedWidget>
 #include <QStringListModel>
 #include <QListWidget>
-#include "tabformwidget.h"
+#include "src/forms/tabformwidget.h"
 #include <QListWidgetItem>
 #include "ui_tabformwidget.h"
 #include <QLabel>

src/forms/settings/AdminSettingForm.h

@@ -5,7 +5,7 @@
 #ifndef GUI_ADMINSETTINGFORM_H
 #define GUI_ADMINSETTINGFORM_H
 
-#include "tabformwidget.h"
+#include "src/forms/tabformwidget.h"
 
 class AdminSettingForm:public TabFormWidget {
     Q_OBJECT

src/forms/settings/generalform.cpp

@@ -10,10 +10,10 @@
 #include <QEvent>
 #include "event/EventCenter.h"
 #include "json/jsonobject.h"
-#include "SelectDialog.h"
+#include "src/dialogs/SelectDialog.h"
 
-#include "locker.h"
-#include "languageswitcher.h"
+#include "src/utilities/locker.h"
+#include "src/utilities/languageswitcher.h"
 
 GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
 {

src/forms/settings/systemsettingform.cpp

@@ -10,7 +10,7 @@
 #include <QEvent>
 #include <QToolButton>
 
-#include "SelectDialog.h"
+#include "src/dialogs/SelectDialog.h"
 #include "components/imageswitch.h"
 #include "network/networkcfgdialog.h"
 #include "network/dicomcfgdialog.h"

src/main.cpp

@@ -1,7 +1,7 @@
-#include "mainwindow.h"
+#include "src/windows/mainwindow.h"
 #include <QApplication>
-#include "loginwindow.h"
-#include "InputObject.h"
+#include "src/windows/loginwindow.h"
+#include "src/utilities/InputObject.h"
 #include <QQmlApplicationEngine>
 #include "db/SQLHelper.h"
 #include <QTextCodec>
@@ -13,8 +13,8 @@
 #include <QTranslator>
 #include <src/device/DeviceManager.h>
 #include "json/jsonobject.h"
-#include "locker.h"
-#include "languageswitcher.h"
+#include "src/utilities/locker.h"
+#include "src/utilities/languageswitcher.h"
 QString loadFontFromFile(QString path)
 {
 	static QString font;

src/network/getadminpsw.h

@@ -5,7 +5,7 @@
 #ifndef GUI_GETADMINPSW_H
 #define GUI_GETADMINPSW_H
 
-#include "GUIFormBaseDialog.h"
+#include "src/dialogs/GUIFormBaseDialog.h"
 class QLineEdit;
 class QLabel;
 class GetAdminPsw :public  GUIFormBaseDialog {

src/network/getipdialog.h

@@ -5,7 +5,7 @@
 #ifndef GUI_GETIPDIALOG_H
 #define GUI_GETIPDIALOG_H
 
-#include "GUIFormBaseDialog.h"
+#include "src/dialogs/GUIFormBaseDialog.h"
 class QLineEdit;
 class QLabel;
 class GetIPDialog :public  GUIFormBaseDialog {

src/network/getroutedialog.h

@@ -5,7 +5,7 @@
 #ifndef GUI_GetRouteDialog_H
 #define GUI_GETROUTEDIALOG_H
 
-#include "GUIFormBaseDialog.h"
+#include "src/dialogs/GUIFormBaseDialog.h"
 class QLineEdit;
 class QLabel;
 class GetRouteDialog :public  GUIFormBaseDialog {

src/network/networkcfgdialog.cpp

@@ -8,7 +8,7 @@
 #include <QItemSelectionModel>
 #include <QGraphicsDropShadowEffect>
 
-#include "guimessagedialog.h"
+#include "src/dialogs/guimessagedialog.h"
 
 #include <QThread>
 networkCfgDialog::networkCfgDialog(QWidget* parent) :

src/windows/loginwindow.cpp

@@ -10,11 +10,11 @@
 #include <QCryptographicHash>
 #include <src/event/EventCenter.h>
 #include "db/SQLHelper.h"
-#include "InputObject.h"
+#include "src/utilities/InputObject.h"
 #include "models/User.h"
 #include "log/UserOperationLog.h"
 #include "json/jsonobject.h"
-#include "guimessagedialog.h"
+#include "src/dialogs/guimessagedialog.h"
 
 LoginWindow::LoginWindow(QWidget* parent)
 	: QDialog(parent)

src/windows/mainwindow.cpp

@@ -4,22 +4,22 @@
 #include <QSizePolicy>
 #include <QHBoxLayout>
 #include "event/EventCenter.h"
-#include "tabformwidget.h"
-#include "SelectFormWidget.h"
-#include "ScanFormWidget.h"
-#include "guimessagedialog.h"
+#include "src/forms/tabformwidget.h"
+#include "src/forms/select/SelectFormWidget.h"
+#include "src/forms/scan/ScanFormWidget.h"
+#include "src/dialogs/guimessagedialog.h"
 #include "device/DeviceManager.h"
 #include "errorhandle/GUIErrorHandle.h"
 #include "loginwindow.h"
 #include <QTextEdit>
 #include <QScrollBar>
 #include "models/User.h"
-#include "AdminSettingForm.h"
+#include "src/forms/settings/AdminSettingForm.h"
 #include "appvals/AppGlobalValues.h"
 #include <fstream>
 #include <sstream>
 #include <QDateTime>
-#include "TopBarWidget.h"
+#include "src/forms/TopBarWidget.h"
 #include <QGestureEvent>
 #include <QDockWidget>
 

src/windows/mainwindow.h

@@ -4,7 +4,7 @@
 #include <QMainWindow>
 #include <QDebug>
 #include <QTimer>
-#include "StdOutRedirector.h"
+#include "src/utilities/StdOutRedirector.h"
 #include "json/cJSON.h"
 #include "loginwindow.h"