UI Framework Modified.

1 files changed, 20 insertions, 25 deletions

diff --git a/include/ui/keypair_details/KeyNewUIDDialog.h b/src/ui/keypair_details/KeyNewUIDDialog.h
index c8b42661..076a69ed 100644
--- a/include/ui/keypair_details/KeyNewUIDDialog.h
+++ b/src/ui/keypair_details/KeyNewUIDDialog.h
@@ -25,42 +25,37 @@
 #ifndef GPGFRONTEND_KEYNEWUIDDIALOG_H
 #define GPGFRONTEND_KEYNEWUIDDIALOG_H
 
-#include "GpgFrontend.h"
-
 #include "gpg/GpgContext.h"
+#include "ui/GpgFrontendUI.h"
 
+namespace GpgFrontend::UI {
 class KeyNewUIDDialog : public QDialog {
-Q_OBJECT
-
-public:
-
-    KeyNewUIDDialog(GpgFrontend::GpgContext *ctx, const GpgKey &key ,QWidget *parent = nullptr);
+  Q_OBJECT
 
+ public:
+  KeyNewUIDDialog(const KeyId& key, QWidget* parent = nullptr);
 
-private slots:
+ private slots:
 
-    void slotCreateNewUID();
+  void slotCreateNewUID();
 
-private:
+ private:
+  GpgKey mKey;
 
-    GpgFrontend::GpgContext *mCtx;
-    const GpgKey &mKey;
+  QLineEdit* name{};
+  QLineEdit* email{};
+  QLineEdit* comment{};
 
-    QLineEdit *name{};
-    QLineEdit *email{};
-    QLineEdit *comment{};
+  QPushButton* createButton{};
 
-    QPushButton *createButton{};
+  QStringList errorMessages;
+  QLabel* errorLabel{};
 
-    QStringList errorMessages;
-    QLabel *errorLabel{};
-
-    QRegularExpression re_email{
-            R"((?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\]))"};
-
-    bool check_email_address(const QString &str);
+  QRegularExpression re_email{
+      R"((?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\]))"};
 
+  bool check_email_address(const QString& str);
 };
+}  // namespace GpgFrontend::UI
 
-
-#endif //GPGFRONTEND_KEYNEWUIDDIALOG_H
+#endif  // GPGFRONTEND_KEYNEWUIDDIALOG_H