diff options
| author | saturneric <[email protected]> | 2025-02-01 23:39:29 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2025-02-01 23:39:29 +0000 |
| commit | cd4a1f749bea0a15df9f4f9dd5d7e18c6466e3ce (patch) | |
| tree | 22fbe8984535ef776b14a40b6bf38bd05f062028 | |
| parent | feat: upgrade KeyGenDialog to meet easy and advanced requirements (diff) | |
| download | GpgFrontend-cd4a1f749bea0a15df9f4f9dd5d7e18c6466e3ce.tar.gz GpgFrontend-cd4a1f749bea0a15df9f4f9dd5d7e18c6466e3ce.zip | |
fix: solve lower/upper case name conflict
| -rw-r--r-- | src/ui/dialog/Wizard.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/key_generate/KeyGenerateDialog.cpp (renamed from src/ui/dialog/key_generate/KeygenDialog.cpp) | 2 | ||||
| -rw-r--r-- | src/ui/dialog/key_generate/KeyGenerateDialog.h (renamed from src/ui/dialog/key_generate/KeygenDialog.h) | 4 | ||||
| -rw-r--r-- | src/ui/main_window/KeyMgmt.cpp | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/ui/dialog/Wizard.cpp b/src/ui/dialog/Wizard.cpp index 32d88b31..243fb846 100644 --- a/src/ui/dialog/Wizard.cpp +++ b/src/ui/dialog/Wizard.cpp @@ -30,7 +30,7 @@ #include "core/function/GlobalSettingStation.h" #include "ui/GpgFrontendUI.h" -#include "ui/dialog/key_generate/KeyGenDialog.h" +#include "ui/dialog/key_generate/KeyGenerateDialog.h" namespace GpgFrontend::UI { diff --git a/src/ui/dialog/key_generate/KeygenDialog.cpp b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp index a5ba98d1..49425e5b 100644 --- a/src/ui/dialog/key_generate/KeygenDialog.cpp +++ b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp @@ -26,7 +26,7 @@ * */ -#include "KeyGenDialog.h" +#include "KeyGenerateDialog.h" #include "core/GpgModel.h" #include "core/function/GlobalSettingStation.h" diff --git a/src/ui/dialog/key_generate/KeygenDialog.h b/src/ui/dialog/key_generate/KeyGenerateDialog.h index fd827ecd..63690831 100644 --- a/src/ui/dialog/key_generate/KeygenDialog.h +++ b/src/ui/dialog/key_generate/KeyGenerateDialog.h @@ -28,11 +28,7 @@ #pragma once -#include <memory> - #include "core/model/GpgGenKeyInfo.h" -#include "core/utils/MemoryUtils.h" -#include "ui/GpgFrontendUI.h" #include "ui/dialog/GeneralDialog.h" class Ui_KeyGenDialog; diff --git a/src/ui/main_window/KeyMgmt.cpp b/src/ui/main_window/KeyMgmt.cpp index f4b06f86..f83226ed 100644 --- a/src/ui/main_window/KeyMgmt.cpp +++ b/src/ui/main_window/KeyMgmt.cpp @@ -41,7 +41,7 @@ #include "ui/UserInterfaceUtils.h" #include "ui/dialog/import_export/ExportKeyPackageDialog.h" #include "ui/dialog/import_export/KeyImportDetailDialog.h" -#include "ui/dialog/key_generate/KeyGenDialog.h" +#include "ui/dialog/key_generate/KeyGenerateDialog.h" #include "ui/dialog/key_generate/SubkeyGenerateDialog.h" #include "ui/dialog/keypair_details/KeyDetailsDialog.h" #include "ui/function/GpgOperaHelper.h" |