2 files changed, 9 insertions, 6 deletions
diff --git a/src/sdk/GFSDKBasic.cpp b/src/sdk/GFSDKBasic.cpp
index ef96237f..b912740e 100644
--- a/src/sdk/GFSDKBasic.cpp
+++ b/src/sdk/GFSDKBasic.cpp
@@ -65,9 +65,10 @@ void GFExecuteCommandSync(const char* cmd, int32_t argc, char** argv,
 
 void GFExecuteCommandBatchSync(GFCommandExecuteContext** contexts,
                                int32_t contexts_size) {
-  QList<GpgFrontend::GpgCommandExecutor::ExecuteContext> core_contexts;
+  GpgFrontend::QContainer<GpgFrontend::GpgCommandExecutor::ExecuteContext>
+      core_contexts;
 
-  QList<GFCommandExecuteContext> sdk_contexts =
+  GpgFrontend::QContainer<GFCommandExecuteContext> sdk_contexts =
       ArrayToQList(contexts, contexts_size);
   for (const auto sdk_context : sdk_contexts) {
     QStringList args =
diff --git a/src/sdk/private/GFSDKPrivat.h b/src/sdk/private/GFSDKPrivat.h
index 1d1cc8d3..aff71420 100644
--- a/src/sdk/private/GFSDKPrivat.h
+++ b/src/sdk/private/GFSDKPrivat.h
@@ -29,6 +29,7 @@
 #pragma once
 
 #include <core/function/SecureMemoryAllocator.h>
+#include <core/typedef/CoreTypedef.h>
 
 Q_DECLARE_LOGGING_CATEGORY(sdk)
 
@@ -108,12 +109,13 @@ auto CharArrayToQStringList(char **char_array, int size) -> QStringList;
 auto QStringListToCharArray(const QStringList &list) -> char **;
 
 template <typename T>
-inline auto ArrayToQList(T **pl_components, int size) -> QList<T> {
+inline auto ArrayToQList(T **pl_components,
+                         int size) -> GpgFrontend::QContainer<T> {
   if (pl_components == nullptr || size <= 0) {
-    return QList<T>();
+    return GpgFrontend::QContainer<T>();
   }
 
-  QList<T> list;
+  GpgFrontend::QContainer<T> list;
   for (int i = 0; i < size; ++i) {
     list.append(*pl_components[i]);
     GpgFrontend::SecureMemoryAllocator::Deallocate(pl_components[i]);
@@ -123,7 +125,7 @@ inline auto ArrayToQList(T **pl_components, int size) -> QList<T> {
 }
 
 template <typename T>
-inline auto QListToArray(const QList<T> &list) -> T ** {
+inline auto QListToArray(const GpgFrontend::QContainer<T> &list) -> T ** {
   T **array = static_cast<T **>(
       GpgFrontend::SecureMemoryAllocator::Allocate(list.size() * sizeof(T *)));
   int index = 0;