From 0291c7d995f03d76579b2695d1a76aa1577a682d Mon Sep 17 00:00:00 2001 From: Krad Date: Wed, 20 Jul 2022 16:53:46 +0800 Subject: [PATCH] Refactor DialogManager.2 --- src/{ => dialogs}/DateSelectDialog.cpp | 0 src/{ => dialogs}/DateSelectDialog.h | 0 src/dialogs/DialogManager.cpp | 1 - src/{ => dialogs}/EditPatientDialog.cpp | 4 +++- src/{ => dialogs}/EditPatientDialog.h | 0 src/forms/select/SelectFormWidget.h | 2 +- 6 files changed, 4 insertions(+), 3 deletions(-) rename src/{ => dialogs}/DateSelectDialog.cpp (100%) rename src/{ => dialogs}/DateSelectDialog.h (100%) rename src/{ => dialogs}/EditPatientDialog.cpp (99%) rename src/{ => dialogs}/EditPatientDialog.h (100%) diff --git a/src/DateSelectDialog.cpp b/src/dialogs/DateSelectDialog.cpp similarity index 100% rename from src/DateSelectDialog.cpp rename to src/dialogs/DateSelectDialog.cpp diff --git a/src/DateSelectDialog.h b/src/dialogs/DateSelectDialog.h similarity index 100% rename from src/DateSelectDialog.h rename to src/dialogs/DateSelectDialog.h diff --git a/src/dialogs/DialogManager.cpp b/src/dialogs/DialogManager.cpp index 46b0f7b..eaf4a7d 100644 --- a/src/dialogs/DialogManager.cpp +++ b/src/dialogs/DialogManager.cpp @@ -106,7 +106,6 @@ void DialogManager::raiseDeviceError(QObject *parent, QObject *msg) { topWidgetStore.push(dialog); dialog->setWindowModality(Qt::NonModal); dialog->exec(); - mErrorCount.fetch_sub(1); auto lastDialog = topWidgetStore.pop(); lastDialog->deleteLater(); } diff --git a/src/EditPatientDialog.cpp b/src/dialogs/EditPatientDialog.cpp similarity index 99% rename from src/EditPatientDialog.cpp rename to src/dialogs/EditPatientDialog.cpp index 69ad9f6..74506fc 100644 --- a/src/EditPatientDialog.cpp +++ b/src/dialogs/EditPatientDialog.cpp @@ -1,13 +1,15 @@ // // Created by Krad on 2022/3/21. // +#include "EditPatientDialog.h" + #include #include #include #include #include #include -#include "EditPatientDialog.h" + #include "dialogs/SelectDialog.h" #include "DateSelectDialog.h" #include "components/ListBox.h" diff --git a/src/EditPatientDialog.h b/src/dialogs/EditPatientDialog.h similarity index 100% rename from src/EditPatientDialog.h rename to src/dialogs/EditPatientDialog.h diff --git a/src/forms/select/SelectFormWidget.h b/src/forms/select/SelectFormWidget.h index 938a107..ecb4210 100644 --- a/src/forms/select/SelectFormWidget.h +++ b/src/forms/select/SelectFormWidget.h @@ -7,7 +7,7 @@ #include "forms/TabFormWidget.h" -#include "EditPatientDialog.h" +#include "dialogs/EditPatientDialog.h" class PatientDetailForm;