password generation refactoring

1 files changed, 1 insertions, 36 deletions

diff --git a/mainwindow.h b/mainwindow.h
index afd30c15..64abe785 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,6 +1,7 @@
 #ifndef MAINWINDOW_H_
 #define MAINWINDOW_H_
 
+#include "datahelpers.h"
 #include "enums.h"
 #include "imitatepass.h"
 #include "pass.h"
@@ -24,41 +25,6 @@ namespace Ui {
 class MainWindow;
 }
 
-struct UserInfo;
-
-/*!
-    \struct passwordConfiguration
-    \brief  holds the Password configuration settings
- */
-struct passwordConfiguration {
-  /**
-   * @brief passwordConfiguration::selected character set.
-   */
-  int selected;
-  /**
-   * @brief passwordConfiguration::length of password.
-   */
-  int length;
-  /**
-   * @brief passwordConfiguration::Characters the different character sets.
-   */
-  QString Characters[4];
-  passwordConfiguration() {
-    length = 16;
-    selected = 0;
-    enum selected { ALLCHARS, ALPHABETICAL, ALPHANUMERIC, CUSTOM };
-    Characters[ALLCHARS] =
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890~!@#$%^&"
-        "*()_-+={}[]|:;<>,.?"; /*AllChars*/
-    Characters[ALPHABETICAL] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstu"
-                               "vwxyz"; /*Only Alphabetical*/
-    Characters[ALPHANUMERIC] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstu"
-                               "vwxyz1234567890"; /*Alphabetical and Numerical*/
-    Characters[CUSTOM] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1"
-                         "234567890~!@#$%^&*()_-+={}[]|:;<>,.?"; /*Custom*/
-  }
-};
-
 /*!
     \class MainWindow
     \brief The MainWindow class does way too much, not only is it a switchboard,
@@ -80,7 +46,6 @@ public:
   QStringList getSecretKeys();
   void generateKeyPair(QString, QDialog *);
   void userDialog(QString = "");
-  QString generatePassword(int length, Enums::characterSet selection);
   void config();
   void executePassGitInit();