refactor: GpgKey and GpgSubKey

1 files changed, 4 insertions, 5 deletions

diff --git a/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
index 1d1231c7..a010a6ea 100644
--- a/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
@@ -176,8 +176,7 @@ void KeyPairUIDTab::slot_refresh_uid_list() {
 
   this->buffered_uids_.clear();
 
-  auto uids = m_key_.GetUIDs();
-  for (auto& uid : *uids) {
+  for (auto& uid : m_key_.UIDs()) {
     this->buffered_uids_.push_back(std::move(uid));
   }
 
@@ -317,7 +316,7 @@ void KeyPairUIDTab::slot_add_sign() {
 
 void KeyPairUIDTab::slot_add_uid() {
   auto* key_new_uid_dialog =
-      new KeyNewUIDDialog(current_gpg_context_channel_, m_key_.GetId(), this);
+      new KeyNewUIDDialog(current_gpg_context_channel_, m_key_.ID(), this);
   connect(key_new_uid_dialog, &KeyNewUIDDialog::finished, this,
           &KeyPairUIDTab::slot_add_uid_result);
   connect(key_new_uid_dialog, &KeyNewUIDDialog::finished, key_new_uid_dialog,
@@ -518,7 +517,7 @@ void KeyPairUIDTab::slot_del_sign() {
 void KeyPairUIDTab::slot_refresh_key() {
   // refresh the key
   GpgKey refreshed_key = GpgKeyGetter::GetInstance(current_gpg_context_channel_)
-                             .GetKey(m_key_.GetId());
+                             .GetKey(m_key_.ID());
   assert(refreshed_key.IsGood());
 
   std::swap(this->m_key_, refreshed_key);
@@ -538,7 +537,7 @@ void KeyPairUIDTab::slot_rev_uid() {
     return;
   }
 
-  const auto uids = m_key_.GetUIDs();
+  const auto uids = m_key_.UIDs();
 
   QString message = tr("<h3>Revoke UID Confirmation</h3><br />"
                        "<b>UID:</b> %1<br /><br />"