summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2017-02-27 10:34:48 +0100
committerAnne Jan Brouwer <brouwer@annejan.com>2017-02-27 10:37:16 +0100
commit113e2a5d3e73b4a4ea11052b807d954d2858b0e0 (patch)
tree822c1dc1b128e205af301131487dd71a2f20cfc4 /src
parent1ad30e3816b60f5153517bbd59530429487371c6 (diff)
Housekeeping (new clang-format settings test)
Diffstat (limited to 'src')
-rw-r--r--src/configdialog.cpp1
-rw-r--r--src/mainwindow.cpp14
-rw-r--r--src/pass.cpp4
3 files changed, 10 insertions, 9 deletions
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 35de4454..c4395996 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -1,6 +1,5 @@
#include "configdialog.h"
#include "debughelper.h"
-#include "debughelper.h"
#include "keygendialog.h"
#include "mainwindow.h"
#include "qtpasssettings.h"
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index be73de3c..356951b6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -975,12 +975,13 @@ void MainWindow::on_addButton_clicked() {
bool ok;
QString dir =
Util::getDir(ui->treeView->currentIndex(), true, model, proxyModel);
- QString file = QInputDialog::getText(
- this, tr("New file"), tr("New password file: \n(Will be placed in %1 )")
+ QString file =
+ QInputDialog::getText(this, tr("New file"),
+ tr("New password file: \n(Will be placed in %1 )")
.arg(QtPassSettings::getPassStore() +
Util::getDir(ui->treeView->currentIndex(),
true, model, proxyModel)),
- QLineEdit::Normal, "", &ok);
+ QLineEdit::Normal, "", &ok);
if (!ok || file.isEmpty())
return;
file = dir + file;
@@ -1363,12 +1364,13 @@ void MainWindow::addFolder() {
bool ok;
QString dir =
Util::getDir(ui->treeView->currentIndex(), false, model, proxyModel);
- QString newdir = QInputDialog::getText(
- this, tr("New file"), tr("New Folder: \n(Will be placed in %1 )")
+ QString newdir =
+ QInputDialog::getText(this, tr("New file"),
+ tr("New Folder: \n(Will be placed in %1 )")
.arg(QtPassSettings::getPassStore() +
Util::getDir(ui->treeView->currentIndex(),
true, model, proxyModel)),
- QLineEdit::Normal, "", &ok);
+ QLineEdit::Normal, "", &ok);
if (!ok || newdir.isEmpty())
return;
newdir.prepend(dir);
diff --git a/src/pass.cpp b/src/pass.cpp
index 242711fc..7fbcc72e 100644
--- a/src/pass.cpp
+++ b/src/pass.cpp
@@ -225,8 +225,8 @@ void Pass::updateEnv() {
} else {
// dbg()<< "Update
// PASSWORD_STORE_DIR with " + passStore;
- env.replaceInStrings(store.first(), "PASSWORD_STORE_DIR=" +
- QtPassSettings::getPassStore());
+ env.replaceInStrings(
+ store.first(), "PASSWORD_STORE_DIR=" + QtPassSettings::getPassStore());
}
exec.setEnvironment(env);
}