fix: discover and fix some bugs

1 files changed, 73 insertions, 69 deletions

diff --git a/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
index 08e9aa9b..2fb1f90a 100644
--- a/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
@@ -45,32 +45,32 @@ KeyPairUIDTab::KeyPairUIDTab(const std::string& key_id, QWidget* parent)
   create_uid_popup_menu();
   create_sign_popup_menu();
 
-  auto uidButtonsLayout = new QGridLayout();
+  auto* uid_buttons_layout = new QGridLayout();
 
-  auto addUIDButton = new QPushButton(_("New UID"));
-  auto manageUIDButton = new QPushButton(_("UID Management"));
+  auto* add_uid_button = new QPushButton(_("New UID"));
+  auto manage_uid_button = new QPushButton(_("UID Management"));
 
   if (m_key_.IsHasMasterKey()) {
-    manageUIDButton->setMenu(manage_selected_uid_menu_);
+    manage_uid_button->setMenu(manage_selected_uid_menu_);
   } else {
-    manageUIDButton->setDisabled(true);
+    manage_uid_button->setDisabled(true);
   }
 
-  uidButtonsLayout->addWidget(addUIDButton, 0, 1);
-  uidButtonsLayout->addWidget(manageUIDButton, 0, 2);
+  uid_buttons_layout->addWidget(add_uid_button, 0, 1);
+  uid_buttons_layout->addWidget(manage_uid_button, 0, 2);
 
-  auto grid_layout = new QGridLayout();
+  auto* grid_layout = new QGridLayout();
 
   grid_layout->addWidget(uid_list_, 0, 0);
-  grid_layout->addLayout(uidButtonsLayout, 1, 0);
+  grid_layout->addLayout(uid_buttons_layout, 1, 0);
   grid_layout->setContentsMargins(0, 10, 0, 0);
 
-  auto uid_group_box = new QGroupBox();
+  auto* uid_group_box = new QGroupBox();
   uid_group_box->setLayout(grid_layout);
   uid_group_box->setTitle(_("UIDs"));
 
-  auto tofu_group_box = new QGroupBox();
-  auto tofu_vbox_layout = new QVBoxLayout();
+  auto* tofu_group_box = new QGroupBox();
+  auto* tofu_vbox_layout = new QVBoxLayout();
   tofu_group_box->setLayout(tofu_vbox_layout);
   tofu_group_box->setTitle(_("TOFU"));
 #if !defined(RELEASE)
@@ -78,25 +78,25 @@ KeyPairUIDTab::KeyPairUIDTab(const std::string& key_id, QWidget* parent)
   tofu_vbox_layout->addWidget(tofu_tabs_);
 #endif
 
-  auto sign_grid_layout = new QGridLayout();
+  auto* sign_grid_layout = new QGridLayout();
   sign_grid_layout->addWidget(sig_list_, 0, 0);
   sign_grid_layout->setContentsMargins(0, 10, 0, 0);
 
-  auto sign_group_box = new QGroupBox();
+  auto* sign_group_box = new QGroupBox();
   sign_group_box->setLayout(sign_grid_layout);
   sign_group_box->setTitle(_("Signature of Selected UID"));
 
-  auto vboxLayout = new QVBoxLayout();
-  vboxLayout->addWidget(uid_group_box);
+  auto* vbox_layout = new QVBoxLayout();
+  vbox_layout->addWidget(uid_group_box);
 #if !defined(RELEASE)
   // Function needed testing
-  vboxLayout->addWidget(tofu_group_box);
+  vbox_layout->addWidget(tofu_group_box);
 #endif
-  vboxLayout->addWidget(sign_group_box);
+  vbox_layout->addWidget(sign_group_box);
 
-  vboxLayout->setContentsMargins(0, 0, 0, 0);
+  vbox_layout->setContentsMargins(0, 0, 0, 0);
 
-  connect(addUIDButton, &QPushButton::clicked, this,
+  connect(add_uid_button, &QPushButton::clicked, this,
           &KeyPairUIDTab::slot_add_uid);
   connect(uid_list_, &QTableWidget::itemSelectionChanged, this,
           &KeyPairUIDTab::slot_refresh_tofu_info);
@@ -112,7 +112,7 @@ KeyPairUIDTab::KeyPairUIDTab(const std::string& key_id, QWidget* parent)
           SignalStation::GetInstance(),
           &SignalStation::SignalKeyDatabaseRefresh);
 
-  setLayout(vboxLayout);
+  setLayout(vbox_layout);
   setAttribute(Qt::WA_DeleteOnClose, true);
 
   slot_refresh_uid_list();
@@ -184,13 +184,13 @@ void KeyPairUIDTab::slot_refresh_uid_list() {
   uid_list_->setRowCount(buffered_uids_.size());
 
   for (const auto& uid : buffered_uids_) {
-    auto* tmp0 = new QTableWidgetItem(QString::fromStdString(uid.GetUID()));
+    auto* tmp0 = new QTableWidgetItem(QString::fromStdString(uid.GetName()));
     uid_list_->setItem(row, 1, tmp0);
 
-    auto* tmp1 = new QTableWidgetItem(QString::fromStdString(uid.GetUID()));
+    auto* tmp1 = new QTableWidgetItem(QString::fromStdString(uid.GetEmail()));
     uid_list_->setItem(row, 2, tmp1);
 
-    auto* tmp2 = new QTableWidgetItem(QString::fromStdString(uid.GetUID()));
+    auto* tmp2 = new QTableWidgetItem(QString::fromStdString(uid.GetComment()));
     uid_list_->setItem(row, 3, tmp2);
 
     auto* tmp3 = new QTableWidgetItem(QString::number(row));
@@ -243,10 +243,11 @@ void KeyPairUIDTab::slot_refresh_tofu_info() {
 }
 
 void KeyPairUIDTab::slot_refresh_sig_list() {
-  int uidRow = 0, sigRow = 0;
+  int uid_row = 0;
+  int sig_row = 0;
   for (const auto& uid : buffered_uids_) {
     // Only Show Selected UID Signatures
-    if (!uid_list_->item(uidRow++, 0)->isSelected()) {
+    if (!uid_list_->item(uid_row++, 0)->isSelected()) {
       continue;
     }
 
@@ -263,22 +264,22 @@ void KeyPairUIDTab::slot_refresh_sig_list() {
 
     for (const auto& sig : buffered_signatures_) {
       auto* tmp0 = new QTableWidgetItem(QString::fromStdString(sig.GetKeyID()));
-      sig_list_->setItem(sigRow, 0, tmp0);
+      sig_list_->setItem(sig_row, 0, tmp0);
 
       if (gpgme_err_code(sig.GetStatus()) == GPG_ERR_NO_PUBKEY) {
         auto* tmp2 = new QTableWidgetItem("<Unknown>");
-        sig_list_->setItem(sigRow, 1, tmp2);
+        sig_list_->setItem(sig_row, 1, tmp2);
 
         auto* tmp3 = new QTableWidgetItem("<Unknown>");
-        sig_list_->setItem(sigRow, 2, tmp3);
+        sig_list_->setItem(sig_row, 2, tmp3);
       } else {
         auto* tmp2 =
             new QTableWidgetItem(QString::fromStdString(sig.GetName()));
-        sig_list_->setItem(sigRow, 1, tmp2);
+        sig_list_->setItem(sig_row, 1, tmp2);
 
         auto* tmp3 =
             new QTableWidgetItem(QString::fromStdString(sig.GetEmail()));
-        sig_list_->setItem(sigRow, 2, tmp3);
+        sig_list_->setItem(sig_row, 2, tmp3);
       }
 #ifdef GPGFRONTEND_GUI_QT6
       auto* tmp4 = new QTableWidgetItem(QLocale::system().toString(
@@ -287,12 +288,11 @@ void KeyPairUIDTab::slot_refresh_sig_list() {
       auto* tmp4 = new QTableWidgetItem(QLocale::system().toString(
           QDateTime::fromTime_t(to_time_t(sig.GetCreateTime()))));
 #endif
-      sig_list_->setItem(sigRow, 3, tmp4);
+      sig_list_->setItem(sig_row, 3, tmp4);
 
 #ifdef GPGFRONTEND_GUI_QT6
       auto* tmp5 = new QTableWidgetItem(
-          boost::posix_time::to_time_t(
-              boost::posix_time::ptime(sig.GetExpireTime())) == 0
+          boost::posix_time::to_time_t(sig.GetExpireTime()) == 0
               ? _("Never Expires")
               : QLocale::system().toString(QDateTime::fromSecsSinceEpoch(
                     to_time_t(sig.GetExpireTime()))));
@@ -305,9 +305,9 @@ void KeyPairUIDTab::slot_refresh_sig_list() {
                     QDateTime::fromTime_t(to_time_t(sig.GetExpireTime()))));
 #endif
       tmp5->setTextAlignment(Qt::AlignCenter);
-      sig_list_->setItem(sigRow, 4, tmp5);
+      sig_list_->setItem(sig_row, 4, tmp5);
 
-      sigRow++;
+      sig_row++;
     }
 
     break;
@@ -324,16 +324,17 @@ void KeyPairUIDTab::slot_add_sign() {
     return;
   }
 
-  auto keySignDialog =
+  auto* key_sign_dialog =
       new KeyUIDSignDialog(m_key_, std::move(selected_uids), this);
-  keySignDialog->show();
+  key_sign_dialog->show();
 }
 
-UIDArgsListPtr KeyPairUIDTab::get_uid_checked() {
+auto KeyPairUIDTab::get_uid_checked() -> UIDArgsListPtr {
   auto selected_uids = std::make_unique<UIDArgsList>();
   for (int i = 0; i < uid_list_->rowCount(); i++) {
-    if (uid_list_->item(i, 0)->checkState() == Qt::Checked)
+    if (uid_list_->item(i, 0)->checkState() == Qt::Checked) {
       selected_uids->push_back(buffered_uids_[i].GetUID());
+    }
   }
   return selected_uids;
 }
@@ -341,24 +342,25 @@ UIDArgsListPtr KeyPairUIDTab::get_uid_checked() {
 void KeyPairUIDTab::create_manage_uid_menu() {
   manage_selected_uid_menu_ = new QMenu(this);
 
-  auto* signUIDAct = new QAction(_("Sign Selected UID(s)"), this);
-  connect(signUIDAct, &QAction::triggered, this, &KeyPairUIDTab::slot_add_sign);
-  auto* delUIDAct = new QAction(_("Delete Selected UID(s)"), this);
-  connect(delUIDAct, &QAction::triggered, this, &KeyPairUIDTab::slot_del_uid);
+  auto* sign_uid_act = new QAction(_("Sign Selected UID(s)"), this);
+  connect(sign_uid_act, &QAction::triggered, this,
+          &KeyPairUIDTab::slot_add_sign);
+  auto* del_uid_act = new QAction(_("Delete Selected UID(s)"), this);
+  connect(del_uid_act, &QAction::triggered, this, &KeyPairUIDTab::slot_del_uid);
 
   if (m_key_.IsHasMasterKey()) {
-    manage_selected_uid_menu_->addAction(signUIDAct);
-    manage_selected_uid_menu_->addAction(delUIDAct);
+    manage_selected_uid_menu_->addAction(sign_uid_act);
+    manage_selected_uid_menu_->addAction(del_uid_act);
   }
 }
 
 void KeyPairUIDTab::slot_add_uid() {
-  auto keyNewUIDDialog = new KeyNewUIDDialog(m_key_.GetId(), this);
-  connect(keyNewUIDDialog, &KeyNewUIDDialog::finished, this,
+  auto* key_new_uid_dialog = new KeyNewUIDDialog(m_key_.GetId(), this);
+  connect(key_new_uid_dialog, &KeyNewUIDDialog::finished, this,
           &KeyPairUIDTab::slot_add_uid_result);
-  connect(keyNewUIDDialog, &KeyNewUIDDialog::finished, keyNewUIDDialog,
+  connect(key_new_uid_dialog, &KeyNewUIDDialog::finished, key_new_uid_dialog,
           &KeyPairUIDTab::deleteLater);
-  keyNewUIDDialog->show();
+  key_new_uid_dialog->show();
 }
 
 void KeyPairUIDTab::slot_add_uid_result(int result) {
@@ -414,9 +416,10 @@ void KeyPairUIDTab::slot_set_primary_uid() {
   auto selected_uids = get_uid_selected();
 
   if (selected_uids->empty()) {
-    auto emptyUIDMsg = new QMessageBox();
-    emptyUIDMsg->setText("Please select one UID before doing this operation.");
-    emptyUIDMsg->exec();
+    auto* empty_uid_msg = new QMessageBox();
+    empty_uid_msg->setText(
+        "Please select one UID before doing this operation.");
+    empty_uid_msg->exec();
     return;
   }
 
@@ -444,7 +447,7 @@ void KeyPairUIDTab::slot_set_primary_uid() {
   }
 }
 
-UIDArgsListPtr KeyPairUIDTab::get_uid_selected() {
+auto KeyPairUIDTab::get_uid_selected() -> UIDArgsListPtr {
   auto uids = std::make_unique<UIDArgsList>();
   for (int i = 0; i < uid_list_->rowCount(); i++) {
     if (uid_list_->item(i, 0)->isSelected()) {
@@ -454,7 +457,7 @@ UIDArgsListPtr KeyPairUIDTab::get_uid_selected() {
   return uids;
 }
 
-SignIdArgsListPtr KeyPairUIDTab::get_sign_selected() {
+auto KeyPairUIDTab::get_sign_selected() -> SignIdArgsListPtr {
   auto signatures = std::make_unique<SignIdArgsList>();
   for (int i = 0; i < sig_list_->rowCount(); i++) {
     if (sig_list_->item(i, 0)->isSelected()) {
@@ -468,20 +471,20 @@ SignIdArgsListPtr KeyPairUIDTab::get_sign_selected() {
 void KeyPairUIDTab::create_uid_popup_menu() {
   uid_popup_menu_ = new QMenu(this);
 
-  auto* serPrimaryUIDAct = new QAction(_("Set As Primary"), this);
-  connect(serPrimaryUIDAct, &QAction::triggered, this,
+  auto* ser_primary_uid_act = new QAction(_("Set As Primary"), this);
+  connect(ser_primary_uid_act, &QAction::triggered, this,
           &KeyPairUIDTab::slot_set_primary_uid);
-  auto* signUIDAct = new QAction(_("Sign UID"), this);
-  connect(signUIDAct, &QAction::triggered, this,
+  auto* sign_uid_act = new QAction(_("Sign UID"), this);
+  connect(sign_uid_act, &QAction::triggered, this,
           &KeyPairUIDTab::slot_add_sign_single);
-  auto* delUIDAct = new QAction(_("Delete UID"), this);
-  connect(delUIDAct, &QAction::triggered, this,
+  auto* del_uid_act = new QAction(_("Delete UID"), this);
+  connect(del_uid_act, &QAction::triggered, this,
           &KeyPairUIDTab::slot_del_uid_single);
 
   if (m_key_.IsHasMasterKey()) {
-    uid_popup_menu_->addAction(serPrimaryUIDAct);
-    uid_popup_menu_->addAction(signUIDAct);
-    uid_popup_menu_->addAction(delUIDAct);
+    uid_popup_menu_->addAction(ser_primary_uid_act);
+    uid_popup_menu_->addAction(sign_uid_act);
+    uid_popup_menu_->addAction(del_uid_act);
   }
 }
 
@@ -502,9 +505,9 @@ void KeyPairUIDTab::slot_add_sign_single() {
     return;
   }
 
-  auto keySignDialog =
+  auto* key_sign_dialog =
       new KeyUIDSignDialog(m_key_, std::move(selected_uids), this);
-  keySignDialog->show();
+  key_sign_dialog->show();
 }
 
 void KeyPairUIDTab::slot_del_uid_single() {
@@ -543,10 +546,11 @@ void KeyPairUIDTab::slot_del_uid_single() {
 void KeyPairUIDTab::create_sign_popup_menu() {
   sign_popup_menu_ = new QMenu(this);
 
-  auto* delSignAct = new QAction(_("Delete(Revoke) Key Signature"), this);
-  connect(delSignAct, &QAction::triggered, this, &KeyPairUIDTab::slot_del_sign);
+  auto* del_sign_act = new QAction(_("Delete(Revoke) Key Signature"), this);
+  connect(del_sign_act, &QAction::triggered, this,
+          &KeyPairUIDTab::slot_del_sign);
 
-  sign_popup_menu_->addAction(delSignAct);
+  sign_popup_menu_->addAction(del_sign_act);
 }
 
 void KeyPairUIDTab::slot_del_sign() {