1 files changed, 7 insertions, 26 deletions
diff --git a/src/core/model/GpgSubKey.h b/src/core/model/GpgSubKey.h
index e9eea6ea..f7d6afd9 100644
--- a/src/core/model/GpgSubKey.h
+++ b/src/core/model/GpgSubKey.h
@@ -81,7 +81,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey {
    * @return true
    * @return false
    */
-  [[nodiscard]] auto IsHasEncryptionCapability() const -> bool;
+  [[nodiscard]] auto IsHasEncrCap() const -> bool;
 
   /**
    * @brief
@@ -89,7 +89,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey {
    * @return true
    * @return false
    */
-  [[nodiscard]] auto IsHasSigningCapability() const -> bool;
+  [[nodiscard]] auto IsHasSignCap() const -> bool;
 
   /**
    * @brief
@@ -97,7 +97,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey {
    * @return true
    * @return false
    */
-  [[nodiscard]] auto IsHasCertificationCapability() const -> bool;
+  [[nodiscard]] auto IsHasCertCap() const -> bool;
 
   /**
    * @brief
@@ -105,7 +105,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey {
    * @return true
    * @return false
    */
-  [[nodiscard]] auto IsHasAuthenticationCapability() const -> bool;
+  [[nodiscard]] auto IsHasAuthCap() const -> bool;
 
   /**
    * @brief
@@ -185,30 +185,15 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey {
   /**
    * @brief Construct a new Gpg Sub Key object
    *
-   * @param o
-   */
-  GpgSubKey(GpgSubKey&& o) noexcept;
-
-  /**
-   * @brief Construct a new Gpg Sub Key object
-   *
-   */
-  GpgSubKey(const GpgSubKey&) = delete;
-
-  /**
-   * @brief
-   *
-   * @param o
-   * @return GpgSubKey&
    */
-  auto operator=(GpgSubKey&& o) noexcept -> GpgSubKey&;
+  GpgSubKey(const GpgSubKey&);
 
   /**
    * @brief
    *
    * @return GpgSubKey&
    */
-  auto operator=(const GpgSubKey&) -> GpgSubKey& = delete;
+  auto operator=(const GpgSubKey&) -> GpgSubKey&;
 
   /**
    * @brief
@@ -220,11 +205,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey {
   auto operator==(const GpgSubKey& o) const -> bool;
 
  private:
-  using SubkeyRefHandler =
-      std::unique_ptr<struct _gpgme_subkey,
-                      std::function<void(gpgme_subkey_t)>>;  ///<
-
-  SubkeyRefHandler subkey_ref_ = nullptr;  ///<
+  gpgme_subkey_t subkey_ref_ = nullptr;  ///<
 };
 
 }  // namespace GpgFrontend