From 5be04d1602355278814bc86c69ec9f648978be8c Mon Sep 17 00:00:00 2001
From: saturneric <eric@bktus.com>
Date: Sat, 27 Jul 2024 14:18:26 +0200
Subject: feat: improve sdk api for pinentry module

---
 src/core/module/ModuleManager.h | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/core/module/ModuleManager.h')

diff --git a/src/core/module/ModuleManager.h b/src/core/module/ModuleManager.h
index ea2d88cb..08abbd27 100644
--- a/src/core/module/ModuleManager.h
+++ b/src/core/module/ModuleManager.h
@@ -28,7 +28,6 @@
 
 #pragma once
 
-#include <mutex>
 #include <vector>
 
 #include "core/function/SecureMemoryAllocator.h"
@@ -123,10 +122,10 @@ void RegisterAndActivateModule(Args&&... args) {
 }
 
 template <typename... Args>
-void TriggerEvent(const EventIdentifier& event_id, Args&&... args,
+void TriggerEvent(const EventIdentifier& event_id,
+                  const Event::Params& params = {},
                   Event::EventCallback e_cb = nullptr) {
-  ModuleManager::GetInstance().TriggerEvent(
-      std::move(MakeEvent(event_id, std::forward<Args>(args)..., e_cb)));
+  ModuleManager::GetInstance().TriggerEvent(MakeEvent(event_id, params, e_cb));
 }
 
 /**
@@ -166,13 +165,12 @@ auto GPGFRONTEND_CORE_EXPORT ListenRTPublishEvent(QObject*, Namespace, Key,
  * @param key
  * @return std::vector<Key>
  */
-auto GPGFRONTEND_CORE_EXPORT ListRTChildKeys(const QString& namespace_,
-                                             const QString& key)
-    -> std::vector<Key>;
+auto GPGFRONTEND_CORE_EXPORT ListRTChildKeys(
+    const QString& namespace_, const QString& key) -> std::vector<Key>;
 
 template <typename T>
-auto RetrieveRTValueTyped(const QString& namespace_, const QString& key)
-    -> std::optional<T> {
+auto RetrieveRTValueTyped(const QString& namespace_,
+                          const QString& key) -> std::optional<T> {
   auto any_value =
       ModuleManager::GetInstance().RetrieveRTValue(namespace_, key);
   if (any_value && any_value->type() == typeid(T)) {
@@ -183,8 +181,8 @@ auto RetrieveRTValueTyped(const QString& namespace_, const QString& key)
 
 template <typename T>
 auto RetrieveRTValueTypedOrDefault(const QString& namespace_,
-                                   const QString& key, const T& defaultValue)
-    -> T {
+                                   const QString& key,
+                                   const T& defaultValue) -> T {
   auto any_value =
       ModuleManager::GetInstance().RetrieveRTValue(namespace_, key);
   if (any_value && any_value->type() == typeid(T)) {
-- 
cgit v1.2.3


From adc5d89717cc1498c69792799c74ace413cca713 Mon Sep 17 00:00:00 2001
From: saturneric <eric@bktus.com>
Date: Sun, 28 Jul 2024 17:07:15 +0200
Subject: fix: correct the spelling of 'deactivate'

---
 src/core/module/ModuleManager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/module/ModuleManager.h')

diff --git a/src/core/module/ModuleManager.h b/src/core/module/ModuleManager.h
index 08abbd27..9f7fab18 100644
--- a/src/core/module/ModuleManager.h
+++ b/src/core/module/ModuleManager.h
@@ -87,7 +87,7 @@ class GPGFRONTEND_CORE_EXPORT ModuleManager
 
   void ActiveModule(ModuleIdentifier);
 
-  void DeactiveModule(ModuleIdentifier);
+  void DeactivateModule(ModuleIdentifier);
 
   auto GetTaskRunner(ModuleIdentifier) -> std::optional<TaskRunnerPtr>;
 
-- 
cgit v1.2.3