now getting "pass" from settings

IJHack · Nov 29, 2016 · 8b01b81 · 8b01b81
1 parent 1bd2ef4
commit 8b01b81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -893,7 +893,7 @@ void MainWindow::setPassword(QString file, bool overwrite, bool isNew = false) {
     // warn?
     return;
   }
-  PasswordDialog d(pwdConfig, *pass, this);
+  PasswordDialog d(pwdConfig, this);
   d.setFile(file);
   d.usePwgen(QtPassSettings::isUsePwgen());
   d.setTemplate(QtPassSettings::getPassTemplate());

diff --git a/passworddialog.cpp b/passworddialog.cpp
@@ -1,5 +1,6 @@
 #include "passworddialog.h"
 #include "ui_passworddialog.h"
+#include "qtpasssettings.h"
 #include <QDebug>
 #include <QLabel>
 #include <QLineEdit>
@@ -9,9 +10,8 @@
  * @param parent
  */
 PasswordDialog::PasswordDialog(const passwordConfiguration &passConfig,
-                               Pass &pass, QWidget *parent)
-    : QDialog(parent), ui(new Ui::PasswordDialog), m_passConfig(passConfig),
-      m_pass(pass) {
+                               QWidget *parent)
+    : QDialog(parent), ui(new Ui::PasswordDialog), m_passConfig(passConfig){
   templating = false;
   allFields = false;
   ui->setupUi(this);
@@ -42,7 +42,7 @@ void PasswordDialog::on_checkBoxShow_stateChanged(int arg1) {
  */
 void PasswordDialog::on_createPasswordButton_clicked() {
   ui->widget->setEnabled(false);
-  QString newPass = m_pass.Generate(
+  QString newPass = QtPassSettings::getPass()->Generate(
       ui->spinBox_pwdLength->value(),
       m_passConfig.Characters[(passwordConfiguration::characterSet)
                                   ui->passwordTemplateSwitch->currentIndex()]);

diff --git a/passworddialog.h b/passworddialog.h
@@ -20,7 +20,7 @@ class PasswordDialog : public QDialog {
   Q_OBJECT
 
 public:
-  explicit PasswordDialog(const passwordConfiguration &passConfig, Pass &pass,
+  explicit PasswordDialog(const passwordConfiguration &passConfig,
                           QWidget *parent = 0);
   ~PasswordDialog();
 
@@ -59,7 +59,6 @@ private slots:
 private:
   Ui::PasswordDialog *ui;
   const passwordConfiguration &m_passConfig;
-  Pass &m_pass;
   QString passTemplate;
   QStringList fields;
   bool templating;