summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2016-12-05 16:44:47 +0100
committerAnne Jan Brouwer <brouwer@annejan.com>2016-12-05 16:44:47 +0100
commit45ccd60ee56f94d18851bb0e3ff903d4f4126512 (patch)
tree68ba8990a72ee8174f61d085dc7027afe1dffead
parentd91849ec309df04c02a9c1f85947e6464dbd61bc (diff)
Minor cleanup and added CONFIG += c++11 which probably fixes #244
-rw-r--r--configdialog.cpp10
-rw-r--r--keygendialog.cpp2
-rw-r--r--mainwindow.cpp4
-rw-r--r--qtpass.pro2
-rw-r--r--usersdialog.cpp2
-rw-r--r--util.cpp2
6 files changed, 12 insertions, 10 deletions
diff --git a/configdialog.cpp b/configdialog.cpp
index 1ae22491..48144ad4 100644
--- a/configdialog.cpp
+++ b/configdialog.cpp
@@ -1,9 +1,9 @@
#include "configdialog.h"
+#include "debughelper.h"
#include "keygendialog.h"
#include "mainwindow.h"
#include "qtpasssettings.h"
#include "ui_configdialog.h"
-#include "debughelper.h"
#include <QDir>
#include <QMessageBox>
#ifdef Q_OS_WIN
@@ -453,7 +453,7 @@ QHash<QString, QString> ConfigDialog::getProfiles() {
if (0 != pathItem) {
QTableWidgetItem *item = ui->profileTable->item(i, 0);
if (item == 0) {
- dbg()<< "empty name, should fix in frontend";
+ dbg() << "empty name, should fix in frontend";
continue;
}
profiles.insert(item->text(), pathItem->text());
@@ -528,7 +528,7 @@ void ConfigDialog::wizard() {
}
QStringList names = mainWindow->getSecretKeys();
- dbg()<< names;
+ dbg() << names;
if (QFile(gpg).exists() && names.empty()) {
KeygenDialog d(this);
if (!d.exec())
@@ -556,7 +556,7 @@ void ConfigDialog::wizard() {
}
if (!QFile(QDir(passStore).filePath(".gpg-id")).exists()) {
- dbg()<< ".gpg-id file does not exist";
+ dbg() << ".gpg-id file does not exist";
if (!clean) {
criticalMessage(tr("Password store not initialised"),
@@ -572,7 +572,7 @@ void ConfigDialog::wizard() {
passStore = ui->storePath->text();
}
if (!QFile(passStore + ".gpg-id").exists()) {
- dbg()<< ".gpg-id file still does not exist :/";
+ dbg() << ".gpg-id file still does not exist :/";
// appears not to be store
// init yes / no ?
mainWindow->userDialog(passStore);
diff --git a/keygendialog.cpp b/keygendialog.cpp
index d1c16a74..9e3d27cc 100644
--- a/keygendialog.cpp
+++ b/keygendialog.cpp
@@ -1,7 +1,7 @@
#include "keygendialog.h"
+#include "debughelper.h"
#include "qprogressindicator.h"
#include "ui_keygendialog.h"
-#include "debughelper.h"
#include <QMessageBox>
/**
diff --git a/mainwindow.cpp b/mainwindow.cpp
index c63a27f1..62fa2482 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1549,8 +1549,8 @@ void MainWindow::addToGridLayout(int position, const QString &field,
/**
* @brief Displays message in status bar
*
- * @params msg text to be displayed
- * @params timeout time for which msg shall be visible
+ * @param msg text to be displayed
+ * @param timeout time for which msg shall be visible
*/
void MainWindow::showStatusMessage(QString msg, int timeout) {
ui->statusBar->showMessage(msg, timeout);
diff --git a/qtpass.pro b/qtpass.pro
index 64e23673..6ca0af61 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -12,6 +12,8 @@ VERSION = 1.1.6
TEMPLATE = app
QT += core gui
+CONFIG += c++11
+
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
macx {
diff --git a/usersdialog.cpp b/usersdialog.cpp
index 97090713..23b99e03 100644
--- a/usersdialog.cpp
+++ b/usersdialog.cpp
@@ -1,6 +1,6 @@
#include "usersdialog.h"
-#include "ui_usersdialog.h"
#include "debughelper.h"
+#include "ui_usersdialog.h"
#include <QRegExp>
/**
diff --git a/util.cpp b/util.cpp
index 4bf8c846..ac1e8df5 100644
--- a/util.cpp
+++ b/util.cpp
@@ -101,7 +101,7 @@ QString Util::findBinaryInPath(QString binary) {
qfi.reset(new QFileInfo(entry.append(".exe")));
#endif
- dbg()<< entry;
+ dbg() << entry;
if (!qfi->isExecutable())
continue;