summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2023-08-31 13:22:57 +0200
committerGitHub <noreply@github.com>2023-08-31 13:22:57 +0200
commita464c5fa9dfd60a9b83b8b09f8c29232af8e5efa (patch)
treecd783f711025a278313ca1ab29c2f7c604cb9d01
parent6c42226ddd1b842d4736e4810173b468c7b68e4f (diff)
parentbc4039bc49c4b2effe2884aa6cd02cbdd1e8f0ba (diff)
Merge pull request #645 from IJHack/clang-formatter1.4.0-rc2
clang-format -i src/*.cpp src/*.h
-rw-r--r--src/keygendialog.cpp3
-rw-r--r--src/mainwindow.cpp3
-rw-r--r--src/pass.cpp2
-rw-r--r--src/qprogressindicator.cpp4
-rw-r--r--src/qprogressindicator.h4
5 files changed, 8 insertions, 8 deletions
diff --git a/src/keygendialog.cpp b/src/keygendialog.cpp
index ef50f434..ba1efdb0 100644
--- a/src/keygendialog.cpp
+++ b/src/keygendialog.cpp
@@ -88,8 +88,7 @@ void KeygenDialog::replace(const QString &key, const QString &value) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
const QStringList lines = expert.split(newLines, Qt::SkipEmptyParts);
#else
- const QStringList lines =
- expert.split(newLines, QString::SkipEmptyParts);
+ const QStringList lines = expert.split(newLines, QString::SkipEmptyParts);
#endif
for (QString line : lines) {
line.replace(QRegularExpression(key + ":.*"), key + ": " + value);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 59d0a105..b39d3147 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -795,7 +795,8 @@ void MainWindow::on_profileBox_currentIndexChanged(QString name) {
QtPassSettings::setProfile(name);
- QtPassSettings::setPassStore(QtPassSettings::getProfiles().value(name).value("path"));
+ QtPassSettings::setPassStore(
+ QtPassSettings::getProfiles().value(name).value("path"));
QtPassSettings::setPassSigningKey(
QtPassSettings::getProfiles().value(name).value("signingKey"));
ui->statusBar->showMessage(tr("Profile changed to %1").arg(name), 2000);
diff --git a/src/pass.cpp b/src/pass.cpp
index efa665dd..44f6401d 100644
--- a/src/pass.cpp
+++ b/src/pass.cpp
@@ -1,8 +1,8 @@
#include "pass.h"
#include "qtpasssettings.h"
#include <QDir>
-#include <QRegularExpression>
#include <QRandomGenerator>
+#include <QRegularExpression>
#ifdef QT_DEBUG
#include "debughelper.h"
diff --git a/src/qprogressindicator.cpp b/src/qprogressindicator.cpp
index 1a47a524..991fdfbe 100644
--- a/src/qprogressindicator.cpp
+++ b/src/qprogressindicator.cpp
@@ -13,8 +13,8 @@
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/src/qprogressindicator.h b/src/qprogressindicator.h
index 8071965d..2d7db91b 100644
--- a/src/qprogressindicator.h
+++ b/src/qprogressindicator.h
@@ -13,8 +13,8 @@
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,