From fb5faf0ff5a0380b2d1ce43495c7f2c6a1f43c17 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Tue, 19 Mar 2019 14:48:33 -0400 Subject: [PATCH] Ran `make format` --- src/browser/BrowserAction.cpp | 4 +-- src/browser/BrowserOptionDialog.cpp | 5 ++- src/browser/BrowserService.cpp | 31 +++++++++++-------- src/core/Database.cpp | 6 ++-- src/core/EntrySearcher.cpp | 2 +- src/core/OSEventFilter.cpp | 2 +- src/gui/Application.cpp | 5 ++- src/gui/ApplicationSettingsWidget.cpp | 3 +- src/gui/MainWindow.cpp | 19 +++++++----- src/gui/UpdateCheckDialog.cpp | 29 +++++++++-------- src/gui/UpdateCheckDialog.h | 13 ++++---- .../DatabaseSettingsWidgetEncryption.cpp | 6 ++-- src/main.cpp | 20 ++++-------- src/proxy/keepassxc-proxy.cpp | 2 +- src/updatecheck/UpdateChecker.cpp | 4 +-- src/updatecheck/UpdateChecker.h | 4 +-- tests/TestGroup.cpp | 1 - tests/TestUpdateCheck.cpp | 4 +-- tests/TestUpdateCheck.h | 2 +- 19 files changed, 79 insertions(+), 83 deletions(-) diff --git a/src/browser/BrowserAction.cpp b/src/browser/BrowserAction.cpp index 59db5dc73..1a4cbf5ec 100644 --- a/src/browser/BrowserAction.cpp +++ b/src/browser/BrowserAction.cpp @@ -21,11 +21,11 @@ #include "NativeMessagingBase.h" #include "config-keepassx.h" +#include +#include #include #include #include -#include -#include BrowserAction::BrowserAction(BrowserService& browserService) : m_mutex(QMutex::Recursive) diff --git a/src/browser/BrowserOptionDialog.cpp b/src/browser/BrowserOptionDialog.cpp index 90da8cde1..0d6609cda 100644 --- a/src/browser/BrowserOptionDialog.cpp +++ b/src/browser/BrowserOptionDialog.cpp @@ -140,9 +140,8 @@ void BrowserOptionDialog::loadSettings() m_ui->updateBinaryPath->setChecked(false); m_ui->updateBinaryPath->setEnabled(false); // Show notice to user - m_ui->browserGlobalWarningWidget->showMessage( - tr("Please see special instructions for browser extension use below"), - MessageWidget::Warning); + m_ui->browserGlobalWarningWidget->showMessage(tr("Please see special instructions for browser extension use below"), + MessageWidget::Warning); m_ui->browserGlobalWarningWidget->setCloseButtonVisible(false); m_ui->browserGlobalWarningWidget->setAutoHideTimeout(-1); #endif diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp index 0a39e18aa..9c06c2487 100644 --- a/src/browser/BrowserService.cpp +++ b/src/browser/BrowserService.cpp @@ -202,8 +202,11 @@ QJsonObject BrowserService::createNewGroup(const QString& groupName) { QJsonObject result; if (thread() != QThread::currentThread()) { - QMetaObject::invokeMethod(this, "createNewGroup", Qt::BlockingQueuedConnection, - Q_RETURN_ARG(QJsonObject, result), Q_ARG(QString, groupName)); + QMetaObject::invokeMethod(this, + "createNewGroup", + Qt::BlockingQueuedConnection, + Q_RETURN_ARG(QJsonObject, result), + Q_ARG(QString, groupName)); return result; } @@ -229,7 +232,8 @@ QJsonObject BrowserService::createNewGroup(const QString& groupName) auto dialogResult = MessageBox::warning(nullptr, tr("KeePassXC: Create a new group"), tr("A request for creating a new group \"%1\" has been received.\n" - "Do you want to create this group?\n").arg(groupName), + "Do you want to create this group?\n") + .arg(groupName), MessageBox::Yes | MessageBox::No); if (dialogResult != MessageBox::Yes) { @@ -243,18 +247,18 @@ QJsonObject BrowserService::createNewGroup(const QString& groupName) // Returns the group name based on depth auto getGroupName = [&](int depth) { QString gName; - for (int i = 0; i < depth+1; ++i) { + for (int i = 0; i < depth + 1; ++i) { gName.append((i == 0 ? "" : "/") + groups[i]); } return gName; }; - + // Create new group(s) always when the path is not found for (int i = 0; i < groups.length(); ++i) { QString gName = getGroupName(i); auto tempGroup = rootGroup->findGroupByPath(gName); if (!tempGroup) { - Group* newGroup = new Group(); + Group* newGroup = new Group(); newGroup->setName(groups[i]); newGroup->setUuid(QUuid::createUuid()); newGroup->setParent(previousGroup); @@ -266,7 +270,7 @@ QJsonObject BrowserService::createNewGroup(const QString& groupName) previousGroup = tempGroup; } - + result["name"] = name; result["uuid"] = uuid; return result; @@ -1070,12 +1074,13 @@ bool BrowserService::checkLegacySettings() return false; } - auto dialogResult = MessageBox::warning(nullptr, - tr("KeePassXC: Legacy browser integration settings detected"), - tr("Your KeePassXC-Browser settings need to be moved into the database settings.\n" - "This is necessary to maintain your current browser connections.\n" - "Would you like to migrate your existing settings now?"), - MessageBox::Yes | MessageBox::No); + auto dialogResult = + MessageBox::warning(nullptr, + tr("KeePassXC: Legacy browser integration settings detected"), + tr("Your KeePassXC-Browser settings need to be moved into the database settings.\n" + "This is necessary to maintain your current browser connections.\n" + "Would you like to migrate your existing settings now?"), + MessageBox::Yes | MessageBox::No); return dialogResult == MessageBox::Yes; } diff --git a/src/core/Database.cpp b/src/core/Database.cpp index 649b4e650..22484cb80 100644 --- a/src/core/Database.cpp +++ b/src/core/Database.cpp @@ -514,8 +514,10 @@ void Database::setCompressionAlgorithm(Database::CompressionAlgorithm algo) * @param transformKey trigger the KDF after setting the key * @return true on success */ -bool Database::setKey(const QSharedPointer& key, bool updateChangedTime, - bool updateTransformSalt, bool transformKey) +bool Database::setKey(const QSharedPointer& key, + bool updateChangedTime, + bool updateTransformSalt, + bool transformKey) { Q_ASSERT(!m_data.isReadOnly); diff --git a/src/core/EntrySearcher.cpp b/src/core/EntrySearcher.cpp index 8ee07dd20..f6c67ad50 100644 --- a/src/core/EntrySearcher.cpp +++ b/src/core/EntrySearcher.cpp @@ -103,7 +103,7 @@ QList EntrySearcher::repeatEntries(const QList& entries) /** * Set the next search to be case sensitive or not * - * @param state + * @param state */ void EntrySearcher::setCaseSensitive(bool state) { diff --git a/src/core/OSEventFilter.cpp b/src/core/OSEventFilter.cpp index ea18aacc1..d5873ee8d 100644 --- a/src/core/OSEventFilter.cpp +++ b/src/core/OSEventFilter.cpp @@ -20,8 +20,8 @@ #include -#include "gui/MainWindow.h" #include "autotype/AutoType.h" +#include "gui/MainWindow.h" #ifdef Q_OS_WIN #include #endif diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp index 5ad928fd3..b79f2c30a 100644 --- a/src/gui/Application.cpp +++ b/src/gui/Application.cpp @@ -125,9 +125,8 @@ Application::Application(int& argc, char** argv) break; } default: - qWarning() << QObject::tr("The lock file could not be created. Single-instance mode disabled.") - .toUtf8() - .constData(); + qWarning() + << QObject::tr("The lock file could not be created. Single-instance mode disabled.").toUtf8().constData(); } } diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp index ffefe2257..90b851bd9 100644 --- a/src/gui/ApplicationSettingsWidget.cpp +++ b/src/gui/ApplicationSettingsWidget.cpp @@ -176,7 +176,8 @@ void ApplicationSettingsWidget::loadSettings() m_generalUi->minimizeOnCloseCheckBox->setChecked(config()->get("GUI/MinimizeOnClose").toBool()); m_generalUi->systrayMinimizeOnStartup->setChecked(config()->get("GUI/MinimizeOnStartup").toBool()); m_generalUi->checkForUpdatesOnStartupCheckBox->setChecked(config()->get("GUI/CheckForUpdates").toBool()); - m_generalUi->checkForUpdatesIncludeBetasCheckBox->setChecked(config()->get("GUI/CheckForUpdatesIncludeBetas").toBool()); + m_generalUi->checkForUpdatesIncludeBetasCheckBox->setChecked( + config()->get("GUI/CheckForUpdatesIncludeBetas").toBool()); m_generalUi->autoTypeAskCheckBox->setChecked(config()->get("security/autotypeask").toBool()); if (autoType()->isAvailable()) { diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 8a851dd39..6e3c96af0 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -42,9 +42,9 @@ #include "keys/PasswordKey.h" #ifdef WITH_XC_NETWORKING -#include "updatecheck/UpdateChecker.h" #include "gui/MessageBox.h" #include "gui/UpdateCheckDialog.h" +#include "updatecheck/UpdateChecker.h" #endif #ifdef WITH_XC_SSHAGENT @@ -374,7 +374,9 @@ MainWindow::MainWindow() #ifdef WITH_XC_NETWORKING connect(m_ui->actionCheckForUpdates, SIGNAL(triggered()), SLOT(showUpdateCheckDialog())); - connect(UpdateChecker::instance(), SIGNAL(updateCheckFinished(bool, QString, bool)), SLOT(hasUpdateAvailable(bool, QString, bool))); + connect(UpdateChecker::instance(), + SIGNAL(updateCheckFinished(bool, QString, bool)), + SLOT(hasUpdateAvailable(bool, QString, bool))); QTimer::singleShot(3000, this, SLOT(showUpdateCheckStartup())); #else m_ui->actionCheckForUpdates->setVisible(false); @@ -687,12 +689,13 @@ void MainWindow::showUpdateCheckStartup() { #ifdef WITH_XC_NETWORKING if (!config()->get("UpdateCheckMessageShown", false).toBool()) { - auto result = MessageBox::question(this, - tr("Check for updates on startup?"), - tr("Would you like KeePassXC to check for updates on startup?") + "\n\n" + - tr("You can always check for updates manually from the application menu."), - MessageBox::Yes | MessageBox::No, - MessageBox::Yes); + auto result = + MessageBox::question(this, + tr("Check for updates on startup?"), + tr("Would you like KeePassXC to check for updates on startup?") + "\n\n" + + tr("You can always check for updates manually from the application menu."), + MessageBox::Yes | MessageBox::No, + MessageBox::Yes); config()->set("GUI/CheckForUpdates", (result == MessageBox::Yes)); config()->set("UpdateCheckMessageShown", true); diff --git a/src/gui/UpdateCheckDialog.cpp b/src/gui/UpdateCheckDialog.cpp index 7b0eff53e..2f6d1fc48 100644 --- a/src/gui/UpdateCheckDialog.cpp +++ b/src/gui/UpdateCheckDialog.cpp @@ -16,9 +16,9 @@ */ #include "UpdateCheckDialog.h" +#include "core/FilePath.h" #include "ui_UpdateCheckDialog.h" #include "updatecheck/UpdateChecker.h" -#include "core/FilePath.h" UpdateCheckDialog::UpdateCheckDialog(QWidget* parent) : QDialog(parent) @@ -31,35 +31,34 @@ UpdateCheckDialog::UpdateCheckDialog(QWidget* parent) m_ui->iconLabel->setPixmap(filePath()->applicationIcon().pixmap(48)); connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close())); - connect(UpdateChecker::instance(), SIGNAL(updateCheckFinished(bool, QString, bool)), SLOT(showUpdateCheckResponse(bool, QString))); + connect(UpdateChecker::instance(), + SIGNAL(updateCheckFinished(bool, QString, bool)), + SLOT(showUpdateCheckResponse(bool, QString))); } -void UpdateCheckDialog::showUpdateCheckResponse(bool status, const QString& version) { +void UpdateCheckDialog::showUpdateCheckResponse(bool status, const QString& version) +{ m_ui->progressBar->setVisible(false); m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close")); if (version == QString("error")) { setWindowTitle(tr("Update Error!")); - m_ui->statusLabel->setText( - "" + tr("Update Error!") + "

" + - tr("An error occurred in retrieving update information.") + "
" + - tr("Please try again later.")); + m_ui->statusLabel->setText("" + tr("Update Error!") + "

" + + tr("An error occurred in retrieving update information.") + "
" + + tr("Please try again later.")); return; } if (status) { setWindowTitle(tr("Software Update")); - m_ui->statusLabel->setText( - "" + tr("A new version of KeePassXC is available!") + "

" + - tr("KeePassXC %1 is now available — you have %2.").arg(version, KEEPASSXC_VERSION) + "

" + - "" + - tr("Download it at keepassxc.org") + - ""); + m_ui->statusLabel->setText("" + tr("A new version of KeePassXC is available!") + "

" + + tr("KeePassXC %1 is now available — you have %2.").arg(version, KEEPASSXC_VERSION) + + "

" + "" + + tr("Download it at keepassxc.org") + ""); } else { setWindowTitle(tr("You're up-to-date!")); - m_ui->statusLabel->setText(tr( - "KeePassXC %1 is currently the newest version available").arg(KEEPASSXC_VERSION)); + m_ui->statusLabel->setText(tr("KeePassXC %1 is currently the newest version available").arg(KEEPASSXC_VERSION)); } } diff --git a/src/gui/UpdateCheckDialog.h b/src/gui/UpdateCheckDialog.h index b601f32db..16e8bcce8 100644 --- a/src/gui/UpdateCheckDialog.h +++ b/src/gui/UpdateCheckDialog.h @@ -18,13 +18,13 @@ #ifndef KEEPASSXC_UPDATECHECKDIALOG_H #define KEEPASSXC_UPDATECHECKDIALOG_H -#include -#include -#include -#include "gui/MessageBox.h" #include "config-keepassx.h" #include "core/Global.h" +#include "gui/MessageBox.h" #include "updatecheck/UpdateChecker.h" +#include +#include +#include namespace Ui { @@ -33,7 +33,7 @@ namespace Ui class UpdateCheckDialog : public QDialog { -Q_OBJECT + Q_OBJECT public: explicit UpdateCheckDialog(QWidget* parent = nullptr); @@ -46,5 +46,4 @@ private: QScopedPointer m_ui; }; - -#endif //KEEPASSXC_UPDATECHECKDIALOG_H +#endif // KEEPASSXC_UPDATECHECKDIALOG_H diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp index 80860673e..e5bd08a10 100644 --- a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp +++ b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp @@ -127,8 +127,7 @@ void DatabaseSettingsWidgetEncryption::setupAlgorithmComboBox() { m_ui->algorithmComboBox->clear(); for (auto& cipher : asConst(KeePass2::CIPHERS)) { - m_ui->algorithmComboBox->addItem(cipher.second.toUtf8(), - cipher.first.toByteArray()); + m_ui->algorithmComboBox->addItem(cipher.second.toUtf8(), cipher.first.toByteArray()); } int cipherIndex = m_ui->algorithmComboBox->findData(m_db->cipher().toByteArray()); if (cipherIndex > -1) { @@ -142,8 +141,7 @@ void DatabaseSettingsWidgetEncryption::setupKdfComboBox() bool block = m_ui->kdfComboBox->blockSignals(true); m_ui->kdfComboBox->clear(); for (auto& kdf : asConst(KeePass2::KDFS)) { - m_ui->kdfComboBox->addItem(kdf.second.toUtf8(), - kdf.first.toByteArray()); + m_ui->kdfComboBox->addItem(kdf.second.toUtf8(), kdf.first.toByteArray()); } m_ui->kdfComboBox->blockSignals(block); } diff --git a/src/main.cpp b/src/main.cpp index a88deb3b3..a546c0491 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -67,19 +67,13 @@ int main(int argc, char** argv) Bootstrap::bootstrapApplication(); QCommandLineParser parser; - parser.setApplicationDescription( - QObject::tr("KeePassXC - cross-platform password manager")); + parser.setApplicationDescription(QObject::tr("KeePassXC - cross-platform password manager")); parser.addPositionalArgument( - "filename", - QObject::tr("filenames of the password databases to open (*.kdbx)"), - "[filename(s)]"); + "filename", QObject::tr("filenames of the password databases to open (*.kdbx)"), "[filename(s)]"); - QCommandLineOption configOption( - "config", QObject::tr("path to a custom config file"), "config"); - QCommandLineOption keyfileOption( - "keyfile", QObject::tr("key file of the database"), "keyfile"); - QCommandLineOption pwstdinOption("pw-stdin", - QObject::tr("read password of the database from stdin")); + QCommandLineOption configOption("config", QObject::tr("path to a custom config file"), "config"); + QCommandLineOption keyfileOption("keyfile", QObject::tr("key file of the database"), "keyfile"); + QCommandLineOption pwstdinOption("pw-stdin", QObject::tr("read password of the database from stdin")); // This is needed under Windows where clients send --parent-window parameter with Native Messaging connect method QCommandLineOption parentWindowOption(QStringList() << "pw" << "parent-window", @@ -106,9 +100,7 @@ int main(int argc, char** argv) if (!fileNames.isEmpty()) { app.sendFileNamesToRunningInstance(fileNames); } - qWarning() << QObject::tr("Another instance of KeePassXC is already running.") - .toUtf8() - .constData(); + qWarning() << QObject::tr("Another instance of KeePassXC is already running.").toUtf8().constData(); return 0; } diff --git a/src/proxy/keepassxc-proxy.cpp b/src/proxy/keepassxc-proxy.cpp index f9a657217..ea472b2c3 100644 --- a/src/proxy/keepassxc-proxy.cpp +++ b/src/proxy/keepassxc-proxy.cpp @@ -77,7 +77,7 @@ int main(int argc, char* argv[]) #ifndef Q_OS_WIN catchUnixSignals({SIGQUIT, SIGINT, SIGTERM, SIGHUP}); #else - SetConsoleCtrlHandler(static_cast(ConsoleHandler),TRUE); + SetConsoleCtrlHandler(static_cast(ConsoleHandler), TRUE); #endif NativeMessagingHost host; return a.exec(); diff --git a/src/updatecheck/UpdateChecker.cpp b/src/updatecheck/UpdateChecker.cpp index 2dafcea3e..4272410b6 100644 --- a/src/updatecheck/UpdateChecker.cpp +++ b/src/updatecheck/UpdateChecker.cpp @@ -16,11 +16,11 @@ */ #include "UpdateChecker.h" -#include "core/Config.h" #include "config-keepassx.h" +#include "core/Config.h" #include -#include #include +#include UpdateChecker* UpdateChecker::m_instance(nullptr); diff --git a/src/updatecheck/UpdateChecker.h b/src/updatecheck/UpdateChecker.h index aa1262bd5..ac6471d64 100644 --- a/src/updatecheck/UpdateChecker.h +++ b/src/updatecheck/UpdateChecker.h @@ -17,8 +17,8 @@ #ifndef KEEPASSXC_UPDATECHECK_H #define KEEPASSXC_UPDATECHECK_H -#include #include +#include class QNetworkAccessManager; class QNetworkReply; @@ -57,4 +57,4 @@ inline UpdateChecker* updateCheck() return UpdateChecker::instance(); } -#endif //KEEPASSXC_UPDATECHECK_H +#endif // KEEPASSXC_UPDATECHECK_H diff --git a/tests/TestGroup.cpp b/tests/TestGroup.cpp index 9abbd31d1..3e4568c35 100644 --- a/tests/TestGroup.cpp +++ b/tests/TestGroup.cpp @@ -811,7 +811,6 @@ void TestGroup::testCopyDataFrom() group3->setName("TestGroup3"); group3->customData()->set("testKey", "value"); - QSignalSpy spyGroupModified(group.data(), SIGNAL(groupModified())); QSignalSpy spyGroupDataChanged(group.data(), SIGNAL(groupDataChanged(Group*))); diff --git a/tests/TestUpdateCheck.cpp b/tests/TestUpdateCheck.cpp index 3bde72950..8cba43b1d 100644 --- a/tests/TestUpdateCheck.cpp +++ b/tests/TestUpdateCheck.cpp @@ -17,8 +17,8 @@ #include "TestUpdateCheck.h" #include "TestGlobal.h" -#include "updatecheck/UpdateChecker.h" #include "crypto/Crypto.h" +#include "updatecheck/UpdateChecker.h" QTEST_GUILESS_MAIN(TestUpdateCheck) @@ -29,7 +29,7 @@ void TestUpdateCheck::initTestCase() void TestUpdateCheck::testCompareVersion() { - // Remote Version , Installed Version + // Remote Version , Installed Version QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), true); QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.4.0")), false); QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0")), false); diff --git a/tests/TestUpdateCheck.h b/tests/TestUpdateCheck.h index 57abd998d..3051aa4f4 100644 --- a/tests/TestUpdateCheck.h +++ b/tests/TestUpdateCheck.h @@ -22,7 +22,7 @@ class TestUpdateCheck : public QObject { -Q_OBJECT + Q_OBJECT private slots: void initTestCase();