summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2019-04-17 13:16:02 +0200
committerAnne Jan Brouwer <brouwer@annejan.com>2019-04-17 13:16:02 +0200
commitd483e98152c64a2d9a6458f634e3c9f14133b96e (patch)
treef7c9e5993f8da10c260ebee4e808370fbbf390f4 /src
parentfeeb40740fc2c7362de4e60fd8a785df1af9f7cc (diff)
Updates and more cleanup
Diffstat (limited to 'src')
-rw-r--r--src/configdialog.cpp3
-rw-r--r--src/mainwindow.cpp5
-rw-r--r--src/qpushbuttonasqrcode.cpp6
-rw-r--r--src/qpushbuttonasqrcode.h2
-rw-r--r--src/qtpass.cpp5
-rw-r--r--src/qtpasssettings.cpp4
6 files changed, 12 insertions, 13 deletions
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 38adc328..dbfaac19 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -74,8 +74,7 @@ ConfigDialog::ConfigDialog(MainWindow *parent)
if (!isQrencodeAvailable()) {
ui->checkBoxUseQrencode->setEnabled(false);
- ui->checkBoxUseQrencode->setToolTip(
- tr("qrencode needs to be installed"));
+ ui->checkBoxUseQrencode->setToolTip(tr("qrencode needs to be installed"));
}
setProfiles(QtPassSettings::getProfiles(), QtPassSettings::getProfile());
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b58fcb02..1a7f91cb 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -8,8 +8,8 @@
#include "filecontent.h"
#include "keygendialog.h"
#include "passworddialog.h"
-#include "qpushbuttonwithclipboard.h"
#include "qpushbuttonasqrcode.h"
+#include "qpushbuttonwithclipboard.h"
#include "qtpass.h"
#include "qtpasssettings.h"
#include "settingsconstants.h"
@@ -1032,8 +1032,7 @@ void MainWindow::addToGridLayout(int position, const QString &field,
}
if (QtPassSettings::isUseQrencode()) {
- QPushButtonAsQRCode *qrbutton =
- new QPushButtonAsQRCode(trimmedValue, this);
+ QPushButtonAsQRCode *qrbutton = new QPushButtonAsQRCode(trimmedValue, this);
connect(qrbutton, &QPushButtonAsQRCode::clicked, m_qtPass,
&QtPass::showTextAsQRCode);
qrbutton->setStyleSheet("border-style: none ; background: transparent;");
diff --git a/src/qpushbuttonasqrcode.cpp b/src/qpushbuttonasqrcode.cpp
index 0d063ac5..cc676889 100644
--- a/src/qpushbuttonasqrcode.cpp
+++ b/src/qpushbuttonasqrcode.cpp
@@ -10,7 +10,7 @@
* the parent window
*/
QPushButtonAsQRCode::QPushButtonAsQRCode(const QString &textToCopy,
- QWidget *parent)
+ QWidget *parent)
: QPushButton(parent), textToCopy(textToCopy),
iconEdit(QIcon::fromTheme("qrcode", QIcon(":/icons/qrcode.svg"))) {
setIcon(iconEdit);
@@ -37,9 +37,7 @@ void QPushButtonAsQRCode::setTextToCopy(const QString &value) {
* @brief QPushButtonAsQRCode::buttonClicked handles clicked event by
* emitting clicked(QString) with string provided to constructor
*/
-void QPushButtonAsQRCode::buttonClicked(bool) {
- emit clicked(textToCopy);
-}
+void QPushButtonAsQRCode::buttonClicked(bool) { emit clicked(textToCopy); }
/**
* @brief QPushButtonAsQRCode::changeIconDefault change the icon back to
diff --git a/src/qpushbuttonasqrcode.h b/src/qpushbuttonasqrcode.h
index d0fe5770..5ee436c0 100644
--- a/src/qpushbuttonasqrcode.h
+++ b/src/qpushbuttonasqrcode.h
@@ -13,7 +13,7 @@ class QPushButtonAsQRCode : public QPushButton {
public:
explicit QPushButtonAsQRCode(const QString &textToCopy = "",
- QWidget *parent = nullptr);
+ QWidget *parent = nullptr);
QString getTextToCopy() const;
void setTextToCopy(const QString &value);
diff --git a/src/qtpass.cpp b/src/qtpass.cpp
index c7e9846d..f4465bf7 100644
--- a/src/qtpass.cpp
+++ b/src/qtpass.cpp
@@ -3,8 +3,8 @@
#include "qtpasssettings.h"
#include <QApplication>
#include <QClipboard>
-#include <QPixmap>
#include <QLabel>
+#include <QPixmap>
#ifndef Q_OS_WIN
#include <QInputDialog>
@@ -413,7 +413,8 @@ void QtPass::copyTextToClipboard(const QString &text) {
*/
void QtPass::showTextAsQRCode(const QString &text) {
QProcess qrencode;
- qrencode.start("/usr/bin/qrencode", QStringList() << "-o-" << "-tPNG");
+ qrencode.start("/usr/bin/qrencode", QStringList() << "-o-"
+ << "-tPNG");
qrencode.write(text.toUtf8());
qrencode.closeWriteChannel();
qrencode.waitForFinished();
diff --git a/src/qtpasssettings.cpp b/src/qtpasssettings.cpp
index 90405a78..55decaaf 100644
--- a/src/qtpasssettings.cpp
+++ b/src/qtpasssettings.cpp
@@ -396,7 +396,9 @@ void QtPassSettings::setUseOtp(const bool &useOtp) {
}
bool QtPassSettings::isUseQrencode(const bool &defaultValue) {
- return getInstance()->value(SettingsConstants::useQrencode, defaultValue).toBool();
+ return getInstance()
+ ->value(SettingsConstants::useQrencode, defaultValue)
+ .toBool();
}
void QtPassSettings::setUseQrencode(const bool &useQrencode) {