<refactor>(src): rename the gpg directory to core

src/CMakeLists.txt

@@ -27,7 +27,7 @@
 
 if (GPG_CORE)
     message(STATUS "Build Gpg Core")
-    add_subdirectory(gpg)
+    add_subdirectory(core)
 endif ()
 
 if (UI_CORE)

src/core/GpgConstants.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 #include <gpg-error.h>
 

src/core/GpgContext.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 
 #include <gpg-error.h>
 #include <gpgme.h>

src/core/GpgGenKeyInfo.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/GpgGenKeyInfo.h"
+#include "core/GpgGenKeyInfo.h"
 
 #include <boost/date_time/gregorian/greg_date.hpp>
 #include <boost/date_time/gregorian/greg_duration.hpp>

src/core/GpgInfo.cpp

@@ -26,4 +26,4 @@
  *
  */
 
-#include "gpg/GpgInfo.h"
+#include "core/GpgInfo.h"

src/core/GpgModel.h

@@ -33,9 +33,9 @@
 #include <utility>
 
 #include "GpgConstants.h"
-#include "gpg/model/GpgData.h"
+#include "core/model/GpgData.h"
-#include "gpg/model/GpgKey.h"
+#include "core/model/GpgKey.h"
-#include "gpg/model/GpgSignature.h"
+#include "core/model/GpgSignature.h"
 
 namespace GpgFrontend {
 

src/core/function/GpgBasicOperator.cpp

@@ -26,11 +26,11 @@
  *
  */
 
-#include "gpg/function/GpgBasicOperator.h"
+#include "core/function/GpgBasicOperator.h"
 
 #include <vector>
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Encrypt(
     KeyListPtr keys, GpgFrontend::BypeArrayRef in_buffer,

src/core/function/GpgBasicOperator.h

@@ -29,10 +29,10 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_BASICOPERATOR_H
 #define GPGFRONTEND_ZH_CN_TS_BASICOPERATOR_H
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
+#include "core/GpgFunctionObject.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 

src/core/function/GpgCommandExecutor.cpp

@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  */
-#include "gpg/function/GpgCommandExecutor.h"
+#include "core/function/GpgCommandExecutor.h"
 #ifndef WINDOWS
 #include <boost/asio.hpp>
 #endif

src/core/function/GpgCommandExecutor.h

@@ -33,8 +33,8 @@
 #include <boost/process.hpp>
 #endif
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
+#include "core/GpgFunctionObject.h"
 
 namespace GpgFrontend {
 

src/core/function/GpgFileOpera.cpp

@@ -25,13 +25,13 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  */
-#include "gpg/function/GpgFileOpera.h"
+#include "core/function/GpgFileOpera.h"
 
 #include <memory>
 #include <string>
 
 #include "GpgConstants.h"
-#include "gpg/function/GpgBasicOperator.h"
+#include "core/function/GpgBasicOperator.h"
 
 GpgFrontend::GpgError GpgFrontend::GpgFileOpera::EncryptFile(
     KeyListPtr keys, const std::string& in_path, const std::string& out_path,

src/core/function/GpgFileOpera.h

@@ -29,9 +29,9 @@
 #ifndef GPGFRONTEND_GPGFILEOPERA_H
 #define GPGFRONTEND_GPGFILEOPERA_H
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 

src/core/function/GpgKeyGetter.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 #include <gpg-error.h>
 

src/core/function/GpgKeyGetter.h

@@ -29,9 +29,9 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_GPGKEYGETTER_H
 #define GPGFRONTEND_ZH_CN_TS_GPGKEYGETTER_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
+#include "core/GpgFunctionObject.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 

src/core/function/GpgKeyImportExporter.cpp

@@ -26,10 +26,10 @@
  *
  */
 
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 
 #include "GpgConstants.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 /**
  * Import key pair

src/core/function/GpgKeyImportExporter.h

@@ -31,10 +31,10 @@
 
 #include <string>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
+#include "core/GpgFunctionObject.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 

src/core/function/GpgKeyManager.cpp

@@ -26,13 +26,13 @@
  *
  */
 
-#include "gpg/function/GpgKeyManager.h"
+#include "core/function/GpgKeyManager.h"
 
 #include <boost/date_time/posix_time/conversion.hpp>
 #include <string>
 
-#include "gpg/function/GpgBasicOperator.h"
+#include "core/function/GpgBasicOperator.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 bool GpgFrontend::GpgKeyManager::SignKey(
     const GpgFrontend::GpgKey& target, GpgFrontend::KeyArgsList& keys,

src/core/function/GpgKeyManager.h

@@ -29,9 +29,9 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_GPGKEYMANAGER_H
 #define GPGFRONTEND_ZH_CN_TS_GPGKEYMANAGER_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
+#include "core/GpgFunctionObject.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 

src/core/function/GpgKeyOpera.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyOpera.h"
 
 #include <boost/asio.hpp>
 #include <boost/date_time/posix_time/conversion.hpp>
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
-#include "gpg/GpgGenKeyInfo.h"
+#include "core/GpgGenKeyInfo.h"
-#include "gpg/function/GpgCommandExecutor.h"
+#include "core/function/GpgCommandExecutor.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 /**
  * Delete keys

src/core/function/GpgKeyOpera.h

@@ -29,9 +29,9 @@
 #ifndef _GPGKEYOPERA_H
 #define _GPGKEYOPERA_H
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 /**

src/core/function/GpgUIDOperator.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/function/GpgUIDOperator.h"
+#include "core/function/GpgUIDOperator.h"
 
 #include "boost/format.hpp"
 

src/core/function/GpgUIDOperator.h

@@ -29,8 +29,8 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_UIDOPERATOR_H
 #define GPGFRONTEND_ZH_CN_TS_UIDOPERATOR_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 /**

src/core/model/GpgData.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/model/GpgData.h"
+#include "core/model/GpgData.h"
 
 GpgFrontend::GpgData::GpgData() {
   gpgme_data_t data;

src/core/model/GpgData.h

@@ -29,7 +29,7 @@
 #ifndef _GPGDATA_H
 #define _GPGDATA_H
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 /**

src/core/model/GpgKey.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/model/GpgKey.h"
+#include "core/model/GpgKey.h"
 
 GpgFrontend::GpgKey::GpgKey(gpgme_key_t &&key) : key_ref_(std::move(key)) {}
 

src/core/model/GpgKeySignature.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/model/GpgKeySignature.h"
+#include "core/model/GpgKeySignature.h"
 
 GpgFrontend::GpgKeySignature::GpgKeySignature(gpgme_key_sig_t sig)
     : signature_ref_(sig, [&](gpgme_key_sig_t signature) {}) {}

src/core/model/GpgKeySignature.h

@@ -32,7 +32,7 @@
 #include <boost/date_time.hpp>
 #include <string>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 /**
  * @brief

src/core/model/GpgSignature.h

@@ -32,7 +32,7 @@
 #include <boost/date_time/gregorian/greg_date.hpp>
 #include <boost/date_time/posix_time/conversion.hpp>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 

src/core/model/GpgSubKey.cpp

@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  */
-#include "gpg/model/GpgSubKey.h"
+#include "core/model/GpgSubKey.h"
 
 GpgFrontend::GpgSubKey::GpgSubKey(gpgme_subkey_t subkey)
     : _subkey_ref(subkey, [&](gpgme_subkey_t subkey) {}) {}

src/core/model/GpgSubKey.h

@@ -32,7 +32,7 @@
 #include <boost/date_time.hpp>
 #include <string>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 

src/core/model/GpgTOFUInfo.h

@@ -29,7 +29,7 @@
 #ifndef GPGFRONTEND_GPGTOFU_H
 #define GPGFRONTEND_GPGTOFU_H
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 /**

src/core/model/GpgUID.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/model/GpgUID.h"
+#include "core/model/GpgUID.h"
 
 GpgFrontend::GpgUID::GpgUID(gpgme_user_id_t uid)
     : uid_ref_(uid, [&](gpgme_user_id_t uid) {}) {}

src/core/result_analyse/GpgDecryptResultAnalyse.cpp

@@ -26,9 +26,9 @@
  *
  */
 
-#include "gpg/result_analyse/GpgDecryptResultAnalyse.h"
+#include "core/result_analyse/GpgDecryptResultAnalyse.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 GpgFrontend::GpgDecryptResultAnalyse::GpgDecryptResultAnalyse(GpgError m_error,
                                                         GpgDecrResult m_result)

src/core/result_analyse/GpgDecryptResultAnalyse.h

@@ -30,7 +30,7 @@
 #define GPGFRONTEND_GPGDECRYPTRESULTANALYSE_H
 
 #include "GpgResultAnalyse.h"
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 

src/core/result_analyse/GpgEncryptResultAnalyse.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/result_analyse/GpgEncryptResultAnalyse.h"
+#include "core/result_analyse/GpgEncryptResultAnalyse.h"
 
 GpgFrontend::GpgEncryptResultAnalyse::GpgEncryptResultAnalyse(GpgError error,
                                                         GpgEncrResult result)

src/core/result_analyse/GpgEncryptResultAnalyse.h

@@ -30,7 +30,7 @@
 #define GPGFRONTEND_GPGENCRYPTRESULTANALYSE_H
 
 #include "GpgResultAnalyse.h"
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 /**

src/core/result_analyse/GpgResultAnalyse.cpp

@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/result_analyse/GpgResultAnalyse.h"
+#include "core/result_analyse/GpgResultAnalyse.h"
 
 const std::string GpgFrontend::GpgResultAnalyse::GetResultReport() const {
   return stream_.str();

src/core/result_analyse/GpgResultAnalyse.h

@@ -31,7 +31,7 @@
 #include <sstream>
 #include <string>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 namespace GpgFrontend {
 
 class GpgResultAnalyse {

src/core/result_analyse/GpgSignResultAnalyse.cpp

@@ -26,9 +26,9 @@
  *
  */
 
-#include "gpg/result_analyse/GpgSignResultAnalyse.h"
+#include "core/result_analyse/GpgSignResultAnalyse.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 GpgFrontend::GpgSignResultAnalyse::GpgSignResultAnalyse(GpgError error,
                                                   GpgSignResult result)

src/core/result_analyse/GpgVerifyResultAnalyse.cpp

@@ -26,13 +26,13 @@
  *
  */
 
-#include "gpg/result_analyse/GpgVerifyResultAnalyse.h"
+#include "core/result_analyse/GpgVerifyResultAnalyse.h"
 
 #include <boost/format.hpp>
 
 #include "GpgFrontend.h"
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 GpgFrontend::GpgVerifyResultAnalyse::GpgVerifyResultAnalyse(GpgError error,
                                                       GpgVerifyResult result)

src/core/result_analyse/GpgVerifyResultAnalyse.h

@@ -30,7 +30,7 @@
 #define GPGFRONTEND_GPGVERIFYRESULTANALYSE_H
 
 #include "GpgResultAnalyse.h"
-#include "gpg/model/GpgKeySignature.h"
+#include "core/model/GpgKeySignature.h"
 
 namespace GpgFrontend {
 /**

src/main.cpp

@@ -35,7 +35,7 @@
 #include <cstdlib>
 
 #include "GpgFrontendBuildInfo.h"
-#include "gpg/GpgFunctionObject.h"
+#include "core/GpgFunctionObject.h"
 #include "ui/main_window/MainWindow.h"
 #include "ui/thread/CtxCheckThread.h"
 

src/ui/GpgFrontendUI.h

@@ -42,8 +42,8 @@
  * Project internal dependencies
  */
 #include "GpgFrontend.h"
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 
 /**
  * 3rd party dependencies

src/ui/KeyMgmt.cpp

@@ -30,9 +30,9 @@
 
 #include <utility>
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyOpera.h"
 #include "ui/import_export/ExportKeyPackageDialog.h"
 #include "ui/SignalStation.h"
 #include "ui/UserInterfaceUtils.h"

src/ui/UserInterfaceUtils.cpp

@@ -31,7 +31,7 @@
 #include <utility>
 
 #include "dialog/WaitingDialog.h"
-#include "gpg/result_analyse/GpgResultAnalyse.h"
+#include "core/result_analyse/GpgResultAnalyse.h"
 #include "ui/SignalStation.h"
 #include "ui/mail/SendMailDialog.h"
 #include "ui/settings/GlobalSettingStation.h"

src/ui/UserInterfaceUtils.h

@@ -29,8 +29,8 @@
 #ifndef GPGFRONTEND_USER_INTERFACE_UTILS_H
 #define GPGFRONTEND_USER_INTERFACE_UTILS_H
 
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
-#include "gpg/result_analyse/GpgVerifyResultAnalyse.h"
+#include "core/result_analyse/GpgVerifyResultAnalyse.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend {

src/ui/dialog/Wizard.h

@@ -29,7 +29,7 @@
 #ifndef WIZARD_H
 #define WIZARD_H
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/KeyMgmt.h"
 #include "ui/key_generate/KeygenDialog.h"

src/ui/help/AboutDialog.h

@@ -29,7 +29,7 @@
 #ifndef __ABOUTDIALOG_H__
 #define __ABOUTDIALOG_H__
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/struct/SoftwareVersion.h"
 

src/ui/import_export/ExportKeyPackageDialog.cpp

@@ -30,8 +30,8 @@
 
 #include <boost/format.hpp>
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui_ExportKeyPackageDialog.h"
 
 GpgFrontend::UI::ExportKeyPackageDialog::ExportKeyPackageDialog(

src/ui/import_export/KeyImportDetailDialog.cpp

@@ -28,7 +28,7 @@
 
 #include "KeyImportDetailDialog.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 namespace GpgFrontend::UI {
 KeyImportDetailDialog::KeyImportDetailDialog(GpgImportInformation result,

src/ui/import_export/KeyImportDetailDialog.h

@@ -29,8 +29,8 @@
 #ifndef __KEYIMPORTDETAILSDIALOG_H__
 #define __KEYIMPORTDETAILSDIALOG_H__
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {

src/ui/import_export/KeyServerImportDialog.cpp

@@ -30,7 +30,7 @@
 
 #include <utility>
 
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 

src/ui/import_export/KeyServerImportDialog.h

@@ -30,7 +30,7 @@
 #define __KEY_SERVER_IMPORT_DIALOG_H__
 
 #include "KeyImportDetailDialog.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/widgets/KeyList.h"
 

src/ui/import_export/KeyUploadDialog.cpp

@@ -30,8 +30,8 @@
 
 #include <algorithm>
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui/settings/GlobalSettingStation.h"
 
 namespace GpgFrontend::UI {

src/ui/import_export/KeyUploadDialog.h

@@ -29,7 +29,7 @@
 #ifndef GPGFRONTEND_KEYUPLOADWIDGET_H
 #define GPGFRONTEND_KEYUPLOADWIDGET_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {

src/ui/key_generate/KeygenDialog.cpp

@@ -29,7 +29,7 @@
 #include "ui/key_generate/KeygenDialog.h"
 
 #include "dialog/WaitingDialog.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 

src/ui/key_generate/KeygenDialog.h

@@ -27,8 +27,8 @@
 #ifndef __KEYGENDIALOG_H__
 #define __KEYGENDIALOG_H__
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgGenKeyInfo.h"
+#include "core/GpgGenKeyInfo.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {

src/ui/key_generate/SubkeyGenerateDialog.cpp

@@ -27,8 +27,8 @@
 #include "ui/key_generate/SubkeyGenerateDialog.h"
 
 #include "dialog/WaitingDialog.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 

src/ui/key_generate/SubkeyGenerateDialog.h

@@ -27,8 +27,8 @@
 #ifndef GPGFRONTEND_SUBKEYGENERATEDIALOG_H
 #define GPGFRONTEND_SUBKEYGENERATEDIALOG_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgGenKeyInfo.h"
+#include "core/GpgGenKeyInfo.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {

src/ui/keypair_details/KeyDetailsDialog.h

@@ -29,7 +29,7 @@
 #ifndef __KEYDETAILSDIALOG_H__
 #define __KEYDETAILSDIALOG_H__
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {

src/ui/keypair_details/KeyNewUIDDialog.cpp

@@ -26,8 +26,8 @@
 
 #include "ui/keypair_details/KeyNewUIDDialog.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgUIDOperator.h"
+#include "core/function/GpgUIDOperator.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {

src/ui/keypair_details/KeyNewUIDDialog.h

@@ -27,7 +27,7 @@
 #ifndef GPGFRONTEND_KEYNEWUIDDIALOG_H
 #define GPGFRONTEND_KEYNEWUIDDIALOG_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {

src/ui/keypair_details/KeyPairDetailTab.cpp

@@ -27,8 +27,8 @@
 #include "ui/keypair_details/KeyPairDetailTab.h"
 
 #include "dialog/WaitingDialog.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {

src/ui/keypair_details/KeyPairDetailTab.h

@@ -28,7 +28,7 @@
 #define GPGFRONTEND_KEYPAIRDETAILTAB_H
 
 #include "KeySetExpireDateDialog.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "import_export/KeyServerImportDialog.h"
 #include "import_export/KeyUploadDialog.h"
 #include "ui/GpgFrontendUI.h"

src/ui/keypair_details/KeyPairOperaTab.cpp

@@ -26,8 +26,8 @@
 
 #include "KeyPairOperaTab.h"
 
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyOpera.h"
 #include "import_export/KeyUploadDialog.h"
 #include "ui/SignalStation.h"
 #include "ui/UserInterfaceUtils.h"

src/ui/keypair_details/KeyPairOperaTab.h

@@ -27,7 +27,7 @@
 #ifndef GPGFRONTEND_KEYPAIROPERATAB_H
 #define GPGFRONTEND_KEYPAIROPERATAB_H
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {

src/ui/keypair_details/KeyPairSubkeyTab.cpp

@@ -28,7 +28,7 @@
 
 #include "ui/keypair_details/KeyPairSubkeyTab.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {

src/ui/keypair_details/KeyPairSubkeyTab.h

@@ -30,7 +30,7 @@
 #define GPGFRONTEND_KEYPAIRSUBKEYTAB_H
 
 #include "KeySetExpireDateDialog.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/key_generate/SubkeyGenerateDialog.h"
 

src/ui/keypair_details/KeyPairUIDTab.cpp

@@ -26,9 +26,9 @@
 
 #include "ui/keypair_details/KeyPairUIDTab.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyManager.h"
+#include "core/function/GpgKeyManager.h"
-#include "gpg/function/GpgUIDOperator.h"
+#include "core/function/GpgUIDOperator.h"
 #include "ui/SignalStation.h"
 #include "ui/widgets/TOFUInfoPage.h"
 

src/ui/keypair_details/KeyPairUIDTab.h

@@ -31,7 +31,7 @@
 
 #include "KeyNewUIDDialog.h"
 #include "KeyUIDSignDialog.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {

src/ui/keypair_details/KeySetExpireDateDialog.cpp

@@ -30,8 +30,8 @@
 
 #include <utility>
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 #include "ui_ModifiedExpirationDateTime.h"

src/ui/keypair_details/KeySetExpireDateDialog.h

@@ -29,9 +29,9 @@
 #ifndef GPGFRONTEND_KEYSETEXPIREDATEDIALOG_H
 #define GPGFRONTEND_KEYSETEXPIREDATEDIALOG_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/model/GpgKey.h"
+#include "core/model/GpgKey.h"
-#include "gpg/model/GpgSubKey.h"
+#include "core/model/GpgSubKey.h"
 #include "ui/GpgFrontendUI.h"
 
 class Ui_ModifiedExpirationDateTime;

src/ui/keypair_details/KeyUIDSignDialog.cpp

@@ -26,8 +26,8 @@
 
 #include "ui/keypair_details/KeyUIDSignDialog.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyManager.h"
+#include "core/function/GpgKeyManager.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {

src/ui/keypair_details/KeyUIDSignDialog.h

@@ -27,7 +27,7 @@
 #ifndef GPGFRONTEND_KEYUIDSIGNDIALOG_H
 #define GPGFRONTEND_KEYUIDSIGNDIALOG_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/widgets/KeyList.h"
 

src/ui/mail/SendMailDialog.cpp

@@ -28,7 +28,7 @@
 
 #include "SendMailDialog.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 #include "ui/mail/EmailListEditor.h"
 #include "ui/mail/RecipientsPicker.h"
 #include "ui/mail/SenderPicker.h"

src/ui/main_window/MainWindow.h

@@ -29,10 +29,10 @@
 #ifndef __GPGWIN_H__
 #define __GPGWIN_H__
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
-#include "gpg/result_analyse/GpgDecryptResultAnalyse.h"
+#include "core/result_analyse/GpgDecryptResultAnalyse.h"
-#include "gpg/result_analyse/GpgEncryptResultAnalyse.h"
+#include "core/result_analyse/GpgEncryptResultAnalyse.h"
-#include "gpg/result_analyse/GpgSignResultAnalyse.h"
+#include "core/result_analyse/GpgSignResultAnalyse.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/KeyMgmt.h"
 #include "ui/dialog/WaitingDialog.h"

src/ui/main_window/MainWindowFileSlotFunction.cpp

@@ -27,8 +27,8 @@
  */
 
 #include "MainWindow.h"
-#include "gpg/function/GpgFileOpera.h"
+#include "core/function/GpgFileOpera.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 #include "ui/UserInterfaceUtils.h"
 #include "ui/settings/GlobalSettingStation.h"
 #include "ui/widgets/SignersPicker.h"

src/ui/main_window/MainWindowSlotFunction.cpp

@@ -39,9 +39,9 @@
 #include "ui/mail/SendMailDialog.h"
 #endif
 
-#include "gpg/function/GpgBasicOperator.h"
+#include "core/function/GpgBasicOperator.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui/UserInterfaceUtils.h"
 #include "ui/help/AboutDialog.h"
 #include "ui/settings/GlobalSettingStation.h"

src/ui/settings/GlobalSettingStation.h

@@ -51,13 +51,13 @@ namespace GpgFrontend::UI {
  */
 class GlobalSettingStation : public QObject {
   Q_OBJECT
- public:
+public:
   /**
    * @brief Get the Instance object
    *
    * @return GlobalSettingStation&
    */
-  static GlobalSettingStation& GetInstance();
+  static GlobalSettingStation &GetInstance();
 
   /**
    * @brief Construct a new Global Setting Station object
@@ -76,7 +76,7 @@ class GlobalSettingStation : public QObject {
    *
    * @return libconfig::Setting&
    */
-  libconfig::Setting& GetUISettings() noexcept { return ui_cfg_.getRoot(); }
+  libconfig::Setting &GetUISettings() noexcept { return ui_cfg_.getRoot(); }
 
   /**
    * @brief Get the App Dir object
@@ -158,14 +158,14 @@ class GlobalSettingStation : public QObject {
    *
    * @param path
    */
-  void AddRootCert(const boost::filesystem::path& path);
+  void AddRootCert(const boost::filesystem::path &path);
 
   /**
    * @brief Get the Root Certs object
    *
    * @return const std::vector<std::shared_ptr<X509>>&
    */
-  const std::vector<std::shared_ptr<X509>>& GetRootCerts();
+  const std::vector<std::shared_ptr<X509>> &GetRootCerts();
 
   /**
    * @brief
@@ -187,7 +187,7 @@ class GlobalSettingStation : public QObject {
    * @return std::string
    */
 
-  std::string SaveDataObj(const std::string& _key, const nlohmann::json& value);
+  std::string SaveDataObj(const std::string &_key, const nlohmann::json &value);
 
   /**
    * @brief Get the Data Object object
@@ -195,7 +195,7 @@ class GlobalSettingStation : public QObject {
    * @param _key
    * @return std::optional<nlohmann::json>
    */
-  std::optional<nlohmann::json> GetDataObject(const std::string& _key);
+  std::optional<nlohmann::json> GetDataObject(const std::string &_key);
 
   /**
    * @brief Get the Data Object By Ref object
@@ -203,9 +203,9 @@ class GlobalSettingStation : public QObject {
    * @param _ref
    * @return std::optional<nlohmann::json>
    */
-  std::optional<nlohmann::json> GetDataObjectByRef(const std::string& _ref);
+  std::optional<nlohmann::json> GetDataObjectByRef(const std::string &_ref);
 
- private:
+private:
   boost::filesystem::path app_path_ =
       qApp->applicationDirPath().toStdString(); ///< Program Location
   boost::filesystem::path app_data_path_ =
@@ -237,8 +237,7 @@ class GlobalSettingStation : public QObject {
       QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)
           .toStdString(); ///< Program Configure Location
   boost::filesystem::path app_secure_path_ =
-      app_configure_path_ /
+      app_configure_path_ / "secure"; ///< Where sensitive information is stored
-      "secure";  ///< Where sensitive information is stored
   boost::filesystem::path app_secure_key_path_ =
       app_secure_path_ / "app.key"; ///<
   boost::filesystem::path ui_config_dir_path_ =

src/ui/thread/CtxCheckThread.cpp

@@ -26,9 +26,9 @@
 
 #include "CtxCheckThread.h"
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
-#include "gpg/GpgCoreInit.h"
+#include "core/GpgCoreInit.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 #include "ui/UserInterfaceUtils.h"
 
 GpgFrontend::UI::CtxCheckThread::CtxCheckThread() : QThread(nullptr) {

src/ui/thread/SMTPSendMailThread.cpp

@@ -28,9 +28,9 @@
 
 #include <boost/format.hpp>
 
-#include "gpg/function/GpgBasicOperator.h"
+#include "core/function/GpgBasicOperator.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 
 namespace GpgFrontend::UI {
 

src/ui/widgets/InfoBoardWidget.h

@@ -30,7 +30,7 @@
 #define __VERIFYNOTIFICATION_H__
 
 #include "PlainTextEditorPage.h"
-#include "gpg/result_analyse/GpgVerifyResultAnalyse.h"
+#include "core/result_analyse/GpgVerifyResultAnalyse.h"
 #include "ui/details/VerifyDetailsDialog.h"
 
 class Ui_InfoBoard;

src/ui/widgets/KeyList.cpp

@@ -31,8 +31,8 @@
 #include <boost/format.hpp>
 #include <utility>
 
-#include "gpg/GpgCoreInit.h"
+#include "core/GpgCoreInit.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 #include "ui/SignalStation.h"
 #include "ui/UserInterfaceUtils.h"
 #include "ui/settings/GlobalSettingStation.h"

src/ui/widgets/KeyList.h

@@ -31,7 +31,7 @@
 
 #include <utility>
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/import_export/KeyImportDetailDialog.h"
 
 class Ui_KeyList;

src/ui/widgets/PlainTextEditorPage.h

@@ -29,7 +29,7 @@
 #ifndef __EDITORPAGE_H__
 #define __EDITORPAGE_H__
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 #include "ui/GpgFrontendUI.h"
 
 class Ui_PlainTextEditor;

src/ui/widgets/TOFUInfoPage.h

@@ -27,7 +27,7 @@
 #ifndef GPGFRONTEND_TOFUINFOPAGE_H
 #define GPGFRONTEND_TOFUINFOPAGE_H
 
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {

src/ui/widgets/VerifyKeyDetailBox.cpp

@@ -28,7 +28,7 @@
 
 #include "ui/widgets/VerifyKeyDetailBox.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 namespace GpgFrontend::UI {