1 files changed, 38 insertions, 35 deletions

diff --git a/src/ui/keypair_details/KeyNewUIDDialog.cpp b/src/ui/keypair_details/KeyNewUIDDialog.cpp
index a4f2bd74..9ff73f9e 100644
--- a/src/ui/keypair_details/KeyNewUIDDialog.cpp
+++ b/src/ui/keypair_details/KeyNewUIDDialog.cpp
@@ -1,4 +1,6 @@
 /**
+ * Copyright (C) 2021 Saturneric
+ *
  * This file is part of GpgFrontend.
  *
  * GpgFrontend is free software: you can redistribute it and/or modify
@@ -6,16 +8,16 @@
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Foobar is distributed in the hope that it will be useful,
+ * GpgFrontend is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+ * along with GpgFrontend. If not, see <https://www.gnu.org/licenses/>.
  *
- * The initial version of the source code is inherited from gpg4usb-team.
- * Their source code version also complies with GNU General Public License.
+ * The initial version of the source code is inherited from
+ * the gpg4usb project, which is under GPL-3.0-or-later.
  *
  * The source code version of this software was modified and released
  * by Saturneric<[email protected]><[email protected]> starting on May 12, 2021.
@@ -24,68 +26,69 @@
 
 #include "ui/keypair_details/KeyNewUIDDialog.h"
 
-#include "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/UIDOperator.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgUIDOperator.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {
 KeyNewUIDDialog::KeyNewUIDDialog(const KeyId& key_id, QWidget* parent)
-    : QDialog(parent), mKey(GpgKeyGetter::GetInstance().GetKey(key_id)) {
-  name = new QLineEdit();
-  name->setMinimumWidth(240);
-  email = new QLineEdit();
-  email->setMinimumWidth(240);
-  comment = new QLineEdit();
-  comment->setMinimumWidth(240);
-  createButton = new QPushButton("Create");
-  errorLabel = new QLabel();
+    : QDialog(parent), m_key_(GpgKeyGetter::GetInstance().GetKey(key_id)) {
+  name_ = new QLineEdit();
+  name_->setMinimumWidth(240);
+  email_ = new QLineEdit();
+  email_->setMinimumWidth(240);
+  comment_ = new QLineEdit();
+  comment_->setMinimumWidth(240);
+  create_button_ = new QPushButton("Create");
+  error_label_ = new QLabel();
 
   auto gridLayout = new QGridLayout();
   gridLayout->addWidget(new QLabel(_("Name")), 0, 0);
   gridLayout->addWidget(new QLabel(_("Email")), 1, 0);
   gridLayout->addWidget(new QLabel(_("Comment")), 2, 0);
 
-  gridLayout->addWidget(name, 0, 1);
-  gridLayout->addWidget(email, 1, 1);
-  gridLayout->addWidget(comment, 2, 1);
+  gridLayout->addWidget(name_, 0, 1);
+  gridLayout->addWidget(email_, 1, 1);
+  gridLayout->addWidget(comment_, 2, 1);
 
-  gridLayout->addWidget(createButton, 3, 0, 1, 2);
+  gridLayout->addWidget(create_button_, 3, 0, 1, 2);
   gridLayout->addWidget(
       new QLabel(_("Notice: The New UID Created will be set as Primary.")), 4,
       0, 1, 2);
-  gridLayout->addWidget(errorLabel, 5, 0, 1, 2);
+  gridLayout->addWidget(error_label_, 5, 0, 1, 2);
 
-  connect(createButton, SIGNAL(clicked(bool)), this, SLOT(slotCreateNewUID()));
+  connect(create_button_, &QPushButton::clicked, this,
+          &KeyNewUIDDialog::slot_create_new_uid);
 
   this->setLayout(gridLayout);
   this->setWindowTitle(_("Create New UID"));
   this->setAttribute(Qt::WA_DeleteOnClose, true);
   this->setModal(true);
 
-  connect(this, SIGNAL(signalUIDCreated()), SignalStation::GetInstance(),
-          SIGNAL(KeyDatabaseRefresh()));
+  connect(this, &KeyNewUIDDialog::SignalUIDCreated, SignalStation::GetInstance(),
+          &SignalStation::SignalKeyDatabaseRefresh);
 }
 
-void KeyNewUIDDialog::slotCreateNewUID() {
+void KeyNewUIDDialog::slot_create_new_uid() {
   std::stringstream error_stream;
 
   /**
    * check for errors in keygen dialog input
    */
-  if ((name->text()).size() < 5) {
+  if ((name_->text()).size() < 5) {
     error_stream << "  " << _("Name must contain at least five characters.")
                  << std::endl;
   }
-  if (email->text().isEmpty() || !check_email_address(email->text())) {
+  if (email_->text().isEmpty() || !check_email_address(email_->text())) {
     error_stream << "  " << _("Please give a email address.") << std::endl;
   }
   auto error_string = error_stream.str();
   if (error_string.empty()) {
-    if (UIDOperator::GetInstance().AddUID(mKey, name->text().toStdString(),
-                                          comment->text().toStdString(),
-                                          email->text().toStdString())) {
+    if (GpgUIDOperator::GetInstance().AddUID(m_key_, name_->text().toStdString(),
+                                          comment_->text().toStdString(),
+                                          email_->text().toStdString())) {
       emit finished(1);
-      emit signalUIDCreated();
+      emit SignalUIDCreated();
     } else
       emit finished(-1);
 
@@ -93,17 +96,17 @@ void KeyNewUIDDialog::slotCreateNewUID() {
     /**
      * create error message
      */
-    errorLabel->setAutoFillBackground(true);
-    QPalette error = errorLabel->palette();
+    error_label_->setAutoFillBackground(true);
+    QPalette error = error_label_->palette();
     error.setColor(QPalette::Window, "#ff8080");
-    errorLabel->setPalette(error);
-    errorLabel->setText(error_string.c_str());
+    error_label_->setPalette(error);
+    error_label_->setText(error_string.c_str());
 
     this->show();
   }
 }
 
 bool KeyNewUIDDialog::check_email_address(const QString& str) {
-  return re_email.match(str).hasMatch();
+  return re_email_.match(str).hasMatch();
 }
 }  // namespace GpgFrontend::UI