Generate Password code from #338 placed

4 files changed, 32 insertions, 33 deletions

diff --git a/src/pass.cpp b/src/pass.cpp
index 8c464ddc..d9600587 100644
--- a/src/pass.cpp
+++ b/src/pass.cpp
@@ -2,8 +2,6 @@
 #include "debughelper.h"
 #include "qtpasssettings.h"
 #include "util.h"
-#include <QTextCodec>
-#include <map>
 
 using namespace std;
 using namespace Enums;
@@ -90,7 +88,7 @@ QString Pass::Generate_b(unsigned int length, const QString &charset) {
     }
   } else {
     if (charset.length() > 0) {
-      passwd = Util::generateRandomPassword(charset, length);
+      passwd = generateRandomPassword(charset, length);
     } else {
       emit critical(
           tr("No characters chosen"),
@@ -276,3 +274,28 @@ QString Pass::getRecipientString(QString for_file, QString separator,
     recipients_str += separator + '"' + recipient + '"';
   return recipients_str;
 }
+
+/* Copyright (C) 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
+
+quint32 Pass::boundedRandom(quint32 bound) {
+  if (bound < 2)
+    return 0;
+
+  quint32 randval;
+  const quint32 max_mod_bound = (1 + ~bound) % bound;
+
+  do
+    randval = QRandomGenerator::system()->generate();
+  while (randval < max_mod_bound);
+
+  return randval % bound;
+}
+
+QString Pass::generateRandomPassword(const QString &charset,
+                                     unsigned int length) {
+  QString out;
+  for (unsigned int i = 0; i < length; ++i)
+    out.append(charset.at(boundedRandom(charset.length())));
+  return out;
+}
diff --git a/src/pass.h b/src/pass.h
index 3686dad6..4242b422 100644
--- a/src/pass.h
+++ b/src/pass.h
@@ -9,7 +9,10 @@
 #include <QList>
 #include <QProcess>
 #include <QQueue>
+#include <QRandomGenerator>
 #include <QString>
+#include <QTextCodec>
+#include <map>
 
 /*!
     \class Pass
@@ -56,6 +59,8 @@ public:
 protected:
   void executeWrapper(PROCESS id, const QString &app, const QStringList &args,
                       bool readStdout = true, bool readStderr = true);
+  QString generateRandomPassword(const QString &charset, unsigned int length);
+  quint32 boundedRandom(quint32 bound);
 
   virtual void executeWrapper(PROCESS id, const QString &app,
                               const QStringList &args, QString input,
diff --git a/src/util.cpp b/src/util.cpp
index cf334122..ae65b519 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -177,31 +177,3 @@ void Util::copyDir(const QString src, const QString dest) {
                 dest + QDir::separator() + file);
   }
 }
-
-/* Copyright (C) 2017 Jason A. Donenfeld <Jason@zx2c4.com>. */
-
-#include <QRandomGenerator>
-#include <QString>
-
-quint32 boundedRandom(quint32 bound) {
-  if (bound < 2)
-    return 0;
-
-  quint32 randval;
-  const quint32 max_mod_bound = (1 + ~bound) % bound;
-
-  do
-    randval = QRandomGenerator::system()->generate();
-  while (randval < max_mod_bound);
-
-  return randval % bound;
-}
-
-static QString generateRandomPassword(const QString &charset,
-                                      unsigned int length) {
-  QString out;
-  for (unsigned int i = 0; i < length; ++i)
-    out.append(charset.at(static_cast<int>(
-        boundedRandom(static_cast<unsigned int>(charset.length())))));
-  return out;
-}
diff --git a/src/util.h b/src/util.h
index 6fcce29a..b980edf8 100644
--- a/src/util.h
+++ b/src/util.h
@@ -22,8 +22,7 @@ public:
                         const QFileSystemModel &model,
                         const StoreModel &storeModel);
   static void copyDir(const QString src, const QString dest);
-  static QString generateRandomPassword(const QString &charset,
-                                        unsigned int length);
+
 private:
   static void initialiseEnvironment();
   static QProcessEnvironment _env;