feat: switch text-based model to workspace-based model

6 files changed, 8 insertions, 9 deletions

diff --git a/src/core/function/gpg/GpgBasicOperator.cpp b/src/core/function/gpg/GpgBasicOperator.cpp
index 43917db3..2f624b60 100644
--- a/src/core/function/gpg/GpgBasicOperator.cpp
+++ b/src/core/function/gpg/GpgBasicOperator.cpp
@@ -30,7 +30,7 @@
 
 #include <gpg-error.h>
 
-#include "core/GpgModel.h"
+#include "core/model/GpgData.h"
 #include "core/model/GpgDecryptResult.h"
 #include "core/model/GpgEncryptResult.h"
 #include "core/model/GpgSignResult.h"
diff --git a/src/core/function/gpg/GpgKeyImportExporter.cpp b/src/core/function/gpg/GpgKeyImportExporter.cpp
index 08e67748..f42c84ce 100644
--- a/src/core/function/gpg/GpgKeyImportExporter.cpp
+++ b/src/core/function/gpg/GpgKeyImportExporter.cpp
@@ -28,7 +28,7 @@
 
 #include "GpgKeyImportExporter.h"
 
-#include "core/GpgModel.h"
+#include "core/model/GpgData.h"
 #include "core/model/GpgImportInformation.h"
 #include "core/utils/AsyncUtils.h"
 #include "core/utils/GpgUtils.h"
diff --git a/src/core/function/gpg/GpgKeyManager.cpp b/src/core/function/gpg/GpgKeyManager.cpp
index a2c53975..9f43d03d 100644
--- a/src/core/function/gpg/GpgKeyManager.cpp
+++ b/src/core/function/gpg/GpgKeyManager.cpp
@@ -28,10 +28,10 @@
 
 #include "GpgKeyManager.h"
 
-#include "core/GpgModel.h"
 #include "core/function/gpg/GpgAutomatonHandler.h"
 #include "core/function/gpg/GpgBasicOperator.h"
 #include "core/function/gpg/GpgKeyGetter.h"
+#include "core/model/GpgData.h"
 #include "core/utils/GpgUtils.h"
 
 namespace GpgFrontend {
diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp
index a951fa6f..e34d224a 100644
--- a/src/core/function/gpg/GpgUIDOperator.cpp
+++ b/src/core/function/gpg/GpgUIDOperator.cpp
@@ -28,8 +28,8 @@
 
 #include "GpgUIDOperator.h"
 
-#include "core/GpgModel.h"
 #include "core/function/gpg/GpgAutomatonHandler.h"
+#include "core/model/GpgData.h"
 #include "core/utils/GpgUtils.h"
 
 namespace GpgFrontend {
diff --git a/src/core/model/GpgKey.cpp b/src/core/model/GpgKey.cpp
index 1a7b7961..6241fd20 100644
--- a/src/core/model/GpgKey.cpp
+++ b/src/core/model/GpgKey.cpp
@@ -128,13 +128,13 @@ auto GpgKey::PrimaryKeyLength() const -> unsigned int {
   return key_ref_->subkeys->length;
 }
 
-auto GpgKey::IsHasEncrCap() const -> bool { return key_ref_->can_encrypt; }
+auto GpgKey::IsHasEncrCap() const -> bool { return IsHasActualEncrCap(); }
 
-auto GpgKey::IsHasSignCap() const -> bool { return key_ref_->can_sign; }
+auto GpgKey::IsHasSignCap() const -> bool { return IsHasActualSignCap(); }
 
-auto GpgKey::IsHasCertCap() const -> bool { return key_ref_->can_certify; }
+auto GpgKey::IsHasCertCap() const -> bool { return IsHasActualCertCap(); }
 
-auto GpgKey::IsHasAuthCap() const -> bool { return key_ref_->can_authenticate; }
+auto GpgKey::IsHasAuthCap() const -> bool { return IsHasActualAuthCap(); }
 
 auto GpgKey::IsHasCardKey() const -> bool {
   auto sub_keys = SubKeys();
diff --git a/src/core/utils/IOUtils.cpp b/src/core/utils/IOUtils.cpp
index 39f00d19..6a195e73 100644
--- a/src/core/utils/IOUtils.cpp
+++ b/src/core/utils/IOUtils.cpp
@@ -28,7 +28,6 @@
 
 #include "IOUtils.h"
 
-#include "core/GpgModel.h"
 #include "core/utils/FilesystemUtils.h"
 
 namespace GpgFrontend {