refactor(modules): migrate to unified GFModule API

- replace legacy module utility includes across module sources
- simplify bootstrap and translation registration macros
- update module headers to use the unified public interface
- replace secure object creation with SDK object factories

30 files changed, 42 insertions, 61 deletions

diff --git a/src/m_email/EMailAccountSettingsPage.cpp b/src/m_email/EMailAccountSettingsPage.cpp
index 69df28c..fbf3bef 100644
--- a/src/m_email/EMailAccountSettingsPage.cpp
+++ b/src/m_email/EMailAccountSettingsPage.cpp
@@ -51,7 +51,7 @@
 #include "EMailSmtpWorker.h"
 #include "EMailTlsSetup.h"
 #include "EMailViewStyle.h"
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_email/EMailAccountStore.cpp b/src/m_email/EMailAccountStore.cpp
index 726d8f6..0198205 100644
--- a/src/m_email/EMailAccountStore.cpp
+++ b/src/m_email/EMailAccountStore.cpp
@@ -35,7 +35,7 @@
 #include <QSettings>
 #include <QUuid>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFSDKUI.h"
 
 namespace {
diff --git a/src/m_email/EMailBasicGpgOpera.cpp b/src/m_email/EMailBasicGpgOpera.cpp
index 63e4343..c3250e8 100644
--- a/src/m_email/EMailBasicGpgOpera.cpp
+++ b/src/m_email/EMailBasicGpgOpera.cpp
@@ -37,7 +37,7 @@
 #include <QCryptographicHash>
 
 #include "EMailHelper.h"
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_email/EMailCredentialStore.cpp b/src/m_email/EMailCredentialStore.cpp
index 262f031..e70ac88 100644
--- a/src/m_email/EMailCredentialStore.cpp
+++ b/src/m_email/EMailCredentialStore.cpp
@@ -28,7 +28,7 @@
 
 #include "EMailCredentialStore.h"
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFSDKBasic.h"
 
 namespace {
diff --git a/src/m_email/EMailImapController.cpp b/src/m_email/EMailImapController.cpp
index 08c1bd9..c376d9e 100644
--- a/src/m_email/EMailImapController.cpp
+++ b/src/m_email/EMailImapController.cpp
@@ -58,7 +58,7 @@
 #include "EMailAccountStore.h"
 #include "EMailCredentialStore.h"
 #include "EMailViewStyle.h"
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_email/EMailImapWorker.cpp b/src/m_email/EMailImapWorker.cpp
index d30623c..fd0e0e7 100644
--- a/src/m_email/EMailImapWorker.cpp
+++ b/src/m_email/EMailImapWorker.cpp
@@ -38,7 +38,7 @@
 #include <vmime/security/defaultAuthenticator.hpp>
 
 #include "EMailTlsSetup.h"
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_email/EMailModule.cpp b/src/m_email/EMailModule.cpp
index bb88669..44134a2 100644
--- a/src/m_email/EMailModule.cpp
+++ b/src/m_email/EMailModule.cpp
@@ -72,19 +72,17 @@
 // vmime extend
 #include <vmime/contentTypeField.hpp>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFModuleBootstrap.h"
-#include "GFModuleDefine.h"
 
 //
 #include "EMailBasicGpgOpera.h"
 #include "EMailHelper.h"
 #include "EMailVerificationPayload.h"
 
-GF_MODULE_BOOTSTRAP_V2("com.bktus.gpgfrontend.module.email", "Email", "2.0.0",
-                        "Everything related to E-Mails.", "Saturneric")
+GF_MODULE_BOOTSTRAP()
 
-DEFINE_TRANSLATIONS_STRUCTURE(ModuleEMail);
+DEFINE_TRANSLATIONS_STRUCTURE();
 
 namespace {
 
diff --git a/src/m_email/EMailModule.h b/src/m_email/EMailModule.h
index b48b426..a8bd687 100644
--- a/src/m_email/EMailModule.h
+++ b/src/m_email/EMailModule.h
@@ -28,6 +28,4 @@
 
 #pragma once
 
-#include "GFModuleDeclare.h"
-
-GF_MODULE_API_DECLARE
\ No newline at end of file
+#include "GFModule.h"
diff --git a/src/m_email/EMailPageView.cpp b/src/m_email/EMailPageView.cpp
index f1511a7..59b9e14 100644
--- a/src/m_email/EMailPageView.cpp
+++ b/src/m_email/EMailPageView.cpp
@@ -83,7 +83,7 @@
 #include "EMailVerificationPayload.h"
 #include "EMailViewLayout.h"
 #include "EMailViewStyle.h"
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_email/EMailSecret.cpp b/src/m_email/EMailSecret.cpp
index 9953cab..a8f6ea3 100644
--- a/src/m_email/EMailSecret.cpp
+++ b/src/m_email/EMailSecret.cpp
@@ -32,7 +32,7 @@
 #include <QString>
 #include <cstring>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_email/EMailSendDialog.cpp b/src/m_email/EMailSendDialog.cpp
index 7caa310..ffb4845 100644
--- a/src/m_email/EMailSendDialog.cpp
+++ b/src/m_email/EMailSendDialog.cpp
@@ -51,7 +51,7 @@
 #include "EMailAccountStore.h"
 #include "EMailCredentialStore.h"
 #include "EMailViewStyle.h"
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_email/EMailSmtpWorker.cpp b/src/m_email/EMailSmtpWorker.cpp
index 6f01855..04d32e5 100644
--- a/src/m_email/EMailSmtpWorker.cpp
+++ b/src/m_email/EMailSmtpWorker.cpp
@@ -32,7 +32,7 @@
 #include <vmime/security/defaultAuthenticator.hpp>
 
 #include "EMailTlsSetup.h"
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_email/EMailTlsSetup.cpp b/src/m_email/EMailTlsSetup.cpp
index ce1797c..1ee4771 100644
--- a/src/m_email/EMailTlsSetup.cpp
+++ b/src/m_email/EMailTlsSetup.cpp
@@ -36,7 +36,7 @@
 #include <vmime/net/tls/TLSSecuredConnectionInfos.hpp>
 #include <vmime/security/cert/defaultCertificateVerifier.hpp>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace cert = vmime::security::cert;
 
diff --git a/src/m_email/EMailViewStyle.h b/src/m_email/EMailViewStyle.h
index 30fc768..e52dc14 100644
--- a/src/m_email/EMailViewStyle.h
+++ b/src/m_email/EMailViewStyle.h
@@ -43,7 +43,7 @@
 #include <QWidget>
 #include <functional>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFSDKUI.h"
 
 /**
diff --git a/src/m_gpg_info/GnuPGInfoGatheringModule.cpp b/src/m_gpg_info/GnuPGInfoGatheringModule.cpp
index fc202d8..ff3c233 100644
--- a/src/m_gpg_info/GnuPGInfoGatheringModule.cpp
+++ b/src/m_gpg_info/GnuPGInfoGatheringModule.cpp
@@ -48,19 +48,16 @@
 // c++
 #include <optional>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFModuleBootstrap.h"
-#include "GFModuleDefine.h"
 #include "GnupgTab.h"
 #include "GpgInfo.h"
 
 // Ported to the single bootstrap symbol: this module now describes itself
 // through one versioned table instead of ten separately-resolved symbols.
-GF_MODULE_BOOTSTRAP_V2("com.bktus.gpgfrontend.module.gnupg_info_gathering",
-                       "GatherGnupgInfo", "1.2.2",
-                       "Try gathering gnupg information.", "Saturneric")
+GF_MODULE_BOOTSTRAP()
 
-DEFINE_TRANSLATIONS_STRUCTURE(ModuleGnuPGInfoGathering);
+DEFINE_TRANSLATIONS_STRUCTURE();
 
 extern auto CalculateBinaryChecksum(const QString &path)
     -> std::optional<QString>;
diff --git a/src/m_gpg_info/GnuPGInfoGatheringModule.h b/src/m_gpg_info/GnuPGInfoGatheringModule.h
index e021464..a59d85c 100644
--- a/src/m_gpg_info/GnuPGInfoGatheringModule.h
+++ b/src/m_gpg_info/GnuPGInfoGatheringModule.h
@@ -28,6 +28,4 @@
 
 #pragma once
 
-#include "GFModuleDeclare.h"
-
-GF_MODULE_API_DECLARE
\ No newline at end of file
+#include "GFModule.h"
diff --git a/src/m_gpg_info/GnupgTab.cpp b/src/m_gpg_info/GnupgTab.cpp
index 299b53d..3cb9d3d 100644
--- a/src/m_gpg_info/GnupgTab.cpp
+++ b/src/m_gpg_info/GnupgTab.cpp
@@ -34,7 +34,7 @@
 
 #include <QtConcurrent>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFSDKModule.h"
 #include "GnuPGInfoGatheringModule.h"
 #include "ui_GnuPGInfo.h"
@@ -42,7 +42,7 @@
 extern auto StartGatheringAllGnuPGInfo() -> int;
 
 GnupgTab::GnupgTab(QWidget* parent)
-    : QWidget(parent), ui_(SecureCreateSharedObject<Ui_GnuPGInfo>()) {
+    : QWidget(parent), ui_(SdkCreateSharedObject<Ui_GnuPGInfo>()) {
   ui_->setupUi(this);
 
   QStringList components_column_titles;
diff --git a/src/m_key_server_sync/KeyServerList.cpp b/src/m_key_server_sync/KeyServerList.cpp
index 326300a..349de86 100644
--- a/src/m_key_server_sync/KeyServerList.cpp
+++ b/src/m_key_server_sync/KeyServerList.cpp
@@ -34,7 +34,7 @@
 #include <QMutexLocker>
 #include <QSettings>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFSDKUI.h"
 
 namespace {
diff --git a/src/m_key_server_sync/KeyServerProbe.cpp b/src/m_key_server_sync/KeyServerProbe.cpp
index d84841f..f93ac76 100644
--- a/src/m_key_server_sync/KeyServerProbe.cpp
+++ b/src/m_key_server_sync/KeyServerProbe.cpp
@@ -37,7 +37,7 @@
 #include <QRegularExpression>
 #include <optional>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_key_server_sync/KeyServerSettingsPage.cpp b/src/m_key_server_sync/KeyServerSettingsPage.cpp
index dd9277e..232a655 100644
--- a/src/m_key_server_sync/KeyServerSettingsPage.cpp
+++ b/src/m_key_server_sync/KeyServerSettingsPage.cpp
@@ -33,7 +33,7 @@
 #include <QTableWidget>
 #include <QUrl>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 //
 #include "ui_KeyServerSettingsPage.h"
@@ -52,7 +52,7 @@ constexpr int kColumnCount = 6;
 
 KeyServerSettingsPage::KeyServerSettingsPage(QWidget* parent)
     : QWidget(parent),
-      ui_(SecureCreateSharedObject<Ui_KeyServerSettingsPage>()) {
+      ui_(SdkCreateSharedObject<Ui_KeyServerSettingsPage>()) {
   ui_->setupUi(this);
 
   ui_->keyServerListGroupBox->setTitle(tr("Key Server List"));
diff --git a/src/m_key_server_sync/KeyServerSyncModule.cpp b/src/m_key_server_sync/KeyServerSyncModule.cpp
index a657f06..e7a5f76 100644
--- a/src/m_key_server_sync/KeyServerSyncModule.cpp
+++ b/src/m_key_server_sync/KeyServerSyncModule.cpp
@@ -34,8 +34,8 @@
 #include <QtNetwork>
 #include <QtWidgets>
 
+#include "GFModule.h"
 #include "GFModuleBootstrap.h"
-#include "GFModuleDefine.h"
 #include "GFSDKUI.h"
 #include "KeyServerList.h"
 #include "KeyServerSettingsPage.h"
@@ -141,12 +141,9 @@ auto ConfirmHkpPublish(QWidget* parent, const QString& url) -> bool {
 }
 }  // namespace
 
-GF_MODULE_BOOTSTRAP_V2("com.bktus.gpgfrontend.module.key_server_sync",
-                        "KeyServerSync", "1.3.2",
-                        "Sync Information From Trusted Key Server.",
-                        "Saturneric")
+GF_MODULE_BOOTSTRAP()
 
-DEFINE_TRANSLATIONS_STRUCTURE(ModuleKeyServerSync);
+DEFINE_TRANSLATIONS_STRUCTURE();
 
 auto GFRegisterModule() -> int {
   LOG_DEBUG("key server sync module registering");
diff --git a/src/m_key_server_sync/KeyServerSyncModule.h b/src/m_key_server_sync/KeyServerSyncModule.h
index 992647a..a59d85c 100644
--- a/src/m_key_server_sync/KeyServerSyncModule.h
+++ b/src/m_key_server_sync/KeyServerSyncModule.h
@@ -28,6 +28,4 @@
 
 #pragma once
 
-#include "GFModuleDeclare.h"
-
-GF_MODULE_API_DECLARE
+#include "GFModule.h"
diff --git a/src/m_key_server_sync/PKSInterface.cpp b/src/m_key_server_sync/PKSInterface.cpp
index 121bb39..9d1b6fa 100644
--- a/src/m_key_server_sync/PKSInterface.cpp
+++ b/src/m_key_server_sync/PKSInterface.cpp
@@ -30,7 +30,7 @@
 
 #include <GFSDKExtra.h>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 
diff --git a/src/m_key_server_sync/SearchKeyDialog.cpp b/src/m_key_server_sync/SearchKeyDialog.cpp
index e19e28d..5d790d5 100644
--- a/src/m_key_server_sync/SearchKeyDialog.cpp
+++ b/src/m_key_server_sync/SearchKeyDialog.cpp
@@ -30,7 +30,7 @@
 
 #include <QRegularExpression>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFSDKGpg.h"
 #include "KeyServerList.h"
 #include "PKSInterface.h"
@@ -75,12 +75,12 @@ auto FormatKeyServerDate(const QString& seconds, const QString& absent)
 }  // namespace
 
 SearchKeyDialog::SearchKeyDialog(QWidget* parent)
-    : QDialog(parent), ui_(SecureCreateSharedObject<Ui_SearchKeyDialog>()) {
+    : QDialog(parent), ui_(SdkCreateSharedObject<Ui_SearchKeyDialog>()) {
   init_ui();
 }
 
 SearchKeyDialog::SearchKeyDialog(const QString& fingerprint, QWidget* parent)
-    : QDialog(parent), ui_(SecureCreateSharedObject<Ui_SearchKeyDialog>()) {
+    : QDialog(parent), ui_(SdkCreateSharedObject<Ui_SearchKeyDialog>()) {
   init_ui();
   SetPresetFingerprint(fingerprint);
 }
diff --git a/src/m_key_server_sync/VKSInterface.cpp b/src/m_key_server_sync/VKSInterface.cpp
index 375b72d..1600298 100644
--- a/src/m_key_server_sync/VKSInterface.cpp
+++ b/src/m_key_server_sync/VKSInterface.cpp
@@ -42,7 +42,7 @@
 #include <QUrl>
 #include <QUrlQuery>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 
 namespace {
 /// Matches the HKP side; without it a stalled server hangs the caller forever.
diff --git a/src/m_ver_check/BKTUSVersionCheckTask.cpp b/src/m_ver_check/BKTUSVersionCheckTask.cpp
index 3c05181..66d13ec 100644
--- a/src/m_ver_check/BKTUSVersionCheckTask.cpp
+++ b/src/m_ver_check/BKTUSVersionCheckTask.cpp
@@ -37,7 +37,7 @@
 #include <QMetaType>
 #include <QtNetwork>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "SoftwareVersion.h"
 #include "Utils.h"
 
diff --git a/src/m_ver_check/GitHubVersionCheckTask.cpp b/src/m_ver_check/GitHubVersionCheckTask.cpp
index dfb80c1..e951637 100644
--- a/src/m_ver_check/GitHubVersionCheckTask.cpp
+++ b/src/m_ver_check/GitHubVersionCheckTask.cpp
@@ -36,7 +36,7 @@
 #include <QMetaType>
 #include <QtNetwork>
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "SoftwareVersion.h"
 #include "Utils.h"
 
diff --git a/src/m_ver_check/UpdateTab.cpp b/src/m_ver_check/UpdateTab.cpp
index 7d285dd..c4ff288 100644
--- a/src/m_ver_check/UpdateTab.cpp
+++ b/src/m_ver_check/UpdateTab.cpp
@@ -28,7 +28,7 @@
 
 #include "UpdateTab.h"
 
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFSDKBasic.h"
 #include "GFSDKModule.h"
 #include "VersionCheckingModule.h"
diff --git a/src/m_ver_check/VersionCheckingModule.cpp b/src/m_ver_check/VersionCheckingModule.cpp
index 69bb3a0..e88a330 100644
--- a/src/m_ver_check/VersionCheckingModule.cpp
+++ b/src/m_ver_check/VersionCheckingModule.cpp
@@ -38,19 +38,16 @@
 #include <QtNetwork>
 
 #include "BKTUSVersionCheckTask.h"
-#include "GFModuleCommonUtils.hpp"
+#include "GFModule.h"
 #include "GFModuleBootstrap.h"
-#include "GFModuleDefine.h"
 #include "GitHubVersionCheckTask.h"
 #include "SoftwareVersion.h"
 #include "UpdateTab.h"
 #include "Utils.h"
 
-GF_MODULE_BOOTSTRAP_V2("com.bktus.gpgfrontend.module.version_checking",
-                        "VersionChecking", "1.5.0",
-                        "Try checking GpgFrontend version.", "Saturneric");
+GF_MODULE_BOOTSTRAP();
 
-DEFINE_TRANSLATIONS_STRUCTURE(ModuleVersionChecking);
+DEFINE_TRANSLATIONS_STRUCTURE();
 
 auto GFRegisterModule() -> int {
   MLogInfo("version checking module registering");
diff --git a/src/m_ver_check/VersionCheckingModule.h b/src/m_ver_check/VersionCheckingModule.h
index 992647a..a59d85c 100644
--- a/src/m_ver_check/VersionCheckingModule.h
+++ b/src/m_ver_check/VersionCheckingModule.h
@@ -28,6 +28,4 @@
 
 #pragma once
 
-#include "GFModuleDeclare.h"
-
-GF_MODULE_API_DECLARE
+#include "GFModule.h"