6 files changed, 15 insertions, 15 deletions
diff --git a/src/core/module/Event.h b/src/core/module/Event.h
index d37992b7..a6660266 100644
--- a/src/core/module/Event.h
+++ b/src/core/module/Event.h
@@ -40,7 +40,7 @@ namespace GpgFrontend::Module {
 
 class Event;
 
-using EventReference = std::shared_ptr<Event>;
+using EventReference = QSharedPointer<Event>;
 using EventIdentifier = QString;
 using EventTriggerIdentifier = QString;
 using Evnets = QContainer<Event>;
diff --git a/src/core/module/GlobalModuleContext.cpp b/src/core/module/GlobalModuleContext.cpp
index fd530432..6e971089 100644
--- a/src/core/module/GlobalModuleContext.cpp
+++ b/src/core/module/GlobalModuleContext.cpp
@@ -353,7 +353,7 @@ class GlobalModuleContext::Impl {
     QStringList listening_event_ids;
   };
 
-  using ModuleRegisterInfoPtr = std::shared_ptr<ModuleRegisterInfo>;
+  using ModuleRegisterInfoPtr = QSharedPointer<ModuleRegisterInfo>;
 
   std::unordered_map<ModuleIdentifier, ModuleRegisterInfoPtr>
       module_register_table_;
diff --git a/src/core/module/GlobalModuleContext.h b/src/core/module/GlobalModuleContext.h
index e0f8e644..611926b1 100644
--- a/src/core/module/GlobalModuleContext.h
+++ b/src/core/module/GlobalModuleContext.h
@@ -43,13 +43,13 @@ class GlobalRegisterTable;
 class Module;
 class ModuleManager;
 using ModuleIdentifier = QString;
-using ModulePtr = std::shared_ptr<Module>;
+using ModulePtr = QSharedPointer<Module>;
 using ModuleRawPtr = Module*;
 
-using GMCPtr = std::shared_ptr<GlobalModuleContext>;
-using GRTPtr = std::shared_ptr<GlobalRegisterTable>;
+using GMCPtr = QSharedPointer<GlobalModuleContext>;
+using GRTPtr = QSharedPointer<GlobalRegisterTable>;
 
-using TaskRunnerPtr = std::shared_ptr<Thread::TaskRunner>;
+using TaskRunnerPtr = QSharedPointer<Thread::TaskRunner>;
 
 class GPGFRONTEND_CORE_EXPORT GlobalModuleContext : public QObject {
   Q_OBJECT
diff --git a/src/core/module/GlobalRegisterTable.cpp b/src/core/module/GlobalRegisterTable.cpp
index 6d83c2fb..e873f527 100644
--- a/src/core/module/GlobalRegisterTable.cpp
+++ b/src/core/module/GlobalRegisterTable.cpp
@@ -58,7 +58,7 @@ class GlobalRegisterTable::Impl {
 
   explicit Impl(GlobalRegisterTable* parent)
       : parent_(parent),
-        root_node_(SecureCreateQSharedObject<RTNode>("", nullptr)) {}
+        root_node_(SecureCreateSharedObject<RTNode>("", nullptr)) {}
 
   auto PublishKV(const Namespace& n, const Key& k, std::any v) -> bool {
     QStringList const segments = (n + "." + k).split('.');
@@ -72,7 +72,7 @@ class GlobalRegisterTable::Impl {
         auto it = current->children.find(segment);
         if (it == current->children.end()) {
           it = current->children.insert(
-              segment, SecureCreateQSharedObject<RTNode>(segment, current));
+              segment, SecureCreateSharedObject<RTNode>(segment, current));
         }
         current = it.value();
       }
diff --git a/src/core/module/Module.h b/src/core/module/Module.h
index d6182688..19c86be4 100644
--- a/src/core/module/Module.h
+++ b/src/core/module/Module.h
@@ -40,9 +40,9 @@ class ModuleManager;
 using ModuleIdentifier = QString;
 using ModuleVersion = QString;
 using ModuleMetaData = QMap<QString, QString>;
-using ModulePtr = std::shared_ptr<Module>;
+using ModulePtr = QSharedPointer<Module>;
 
-using TaskRunnerPtr = std::shared_ptr<Thread::TaskRunner>;
+using TaskRunnerPtr = QSharedPointer<Thread::TaskRunner>;
 
 class GPGFRONTEND_CORE_EXPORT Module : public QObject {
   Q_OBJECT
diff --git a/src/core/module/ModuleManager.h b/src/core/module/ModuleManager.h
index 0077fe44..2c7d3bee 100644
--- a/src/core/module/ModuleManager.h
+++ b/src/core/module/ModuleManager.h
@@ -41,7 +41,7 @@ class TaskRunner;
 
 namespace GpgFrontend::Module {
 
-using TaskRunnerPtr = std::shared_ptr<Thread::TaskRunner>;
+using TaskRunnerPtr = QSharedPointer<Thread::TaskRunner>;
 
 class Event;
 class Module;
@@ -49,11 +49,11 @@ class GlobalModuleContext;
 class ModuleManager;
 class GlobalRegisterTable;
 
-using EventReference = std::shared_ptr<Event>;
+using EventReference = QSharedPointer<Event>;
 using ModuleIdentifier = QString;
-using ModulePtr = std::shared_ptr<Module>;
-using ModuleMangerPtr = std::shared_ptr<ModuleManager>;
-using GMCPtr = std::shared_ptr<GlobalModuleContext>;
+using ModulePtr = QSharedPointer<Module>;
+using ModuleMangerPtr = QSharedPointer<ModuleManager>;
+using GMCPtr = QSharedPointer<GlobalModuleContext>;
 using Namespace = QString;
 using Key = QString;
 using LPCallback = std::function<void(Namespace, Key, int, std::any)>;