Skip to content

Commit 45ccd60

Browse files
committed
Minor cleanup and added CONFIG += c++11 which probably fixes #244
1 parent d91849e commit 45ccd60

6 files changed

+12
-10
lines changed

configdialog.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include "configdialog.h"
2+
#include "debughelper.h"
23
#include "keygendialog.h"
34
#include "mainwindow.h"
45
#include "qtpasssettings.h"
56
#include "ui_configdialog.h"
6-
#include "debughelper.h"
77
#include <QDir>
88
#include <QMessageBox>
99
#ifdef Q_OS_WIN
@@ -453,7 +453,7 @@ QHash<QString, QString> ConfigDialog::getProfiles() {
453453
if (0 != pathItem) {
454454
QTableWidgetItem *item = ui->profileTable->item(i, 0);
455455
if (item == 0) {
456-
dbg()<< "empty name, should fix in frontend";
456+
dbg() << "empty name, should fix in frontend";
457457
continue;
458458
}
459459
profiles.insert(item->text(), pathItem->text());
@@ -528,7 +528,7 @@ void ConfigDialog::wizard() {
528528
}
529529

530530
QStringList names = mainWindow->getSecretKeys();
531-
dbg()<< names;
531+
dbg() << names;
532532
if (QFile(gpg).exists() && names.empty()) {
533533
KeygenDialog d(this);
534534
if (!d.exec())
@@ -556,7 +556,7 @@ void ConfigDialog::wizard() {
556556
}
557557

558558
if (!QFile(QDir(passStore).filePath(".gpg-id")).exists()) {
559-
dbg()<< ".gpg-id file does not exist";
559+
dbg() << ".gpg-id file does not exist";
560560

561561
if (!clean) {
562562
criticalMessage(tr("Password store not initialised"),
@@ -572,7 +572,7 @@ void ConfigDialog::wizard() {
572572
passStore = ui->storePath->text();
573573
}
574574
if (!QFile(passStore + ".gpg-id").exists()) {
575-
dbg()<< ".gpg-id file still does not exist :/";
575+
dbg() << ".gpg-id file still does not exist :/";
576576
// appears not to be store
577577
// init yes / no ?
578578
mainWindow->userDialog(passStore);

keygendialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "keygendialog.h"
2+
#include "debughelper.h"
23
#include "qprogressindicator.h"
34
#include "ui_keygendialog.h"
4-
#include "debughelper.h"
55
#include <QMessageBox>
66

77
/**

mainwindow.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1549,8 +1549,8 @@ void MainWindow::addToGridLayout(int position, const QString &field,
15491549
/**
15501550
* @brief Displays message in status bar
15511551
*
1552-
* @params msg text to be displayed
1553-
* @params timeout time for which msg shall be visible
1552+
* @param msg text to be displayed
1553+
* @param timeout time for which msg shall be visible
15541554
*/
15551555
void MainWindow::showStatusMessage(QString msg, int timeout) {
15561556
ui->statusBar->showMessage(msg, timeout);

qtpass.pro

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ VERSION = 1.1.6
1212
TEMPLATE = app
1313
QT += core gui
1414

15+
CONFIG += c++11
16+
1517
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
1618

1719
macx {

usersdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "usersdialog.h"
2-
#include "ui_usersdialog.h"
32
#include "debughelper.h"
3+
#include "ui_usersdialog.h"
44
#include <QRegExp>
55

66
/**

util.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ QString Util::findBinaryInPath(QString binary) {
101101
qfi.reset(new QFileInfo(entry.append(".exe")));
102102

103103
#endif
104-
dbg()<< entry;
104+
dbg() << entry;
105105
if (!qfi->isExecutable())
106106
continue;
107107

0 commit comments

Comments
 (0)