From c3df16147d6460d1bd708830fb41d9bcb953cf24 Mon Sep 17 00:00:00 2001 From: Carlo Teubner Date: Thu, 13 Jun 2024 02:25:15 +0100 Subject: [PATCH] Cleanup compiler warnings on all platforms (#10847) Fixes #10730. Co-authored-by: Christoph Reiter --- src/browser/BrowserService.cpp | 21 +++++++++++-------- src/core/FileWatcher.cpp | 4 ++-- .../widgets/AccessControlDialog.cpp | 2 +- src/gui/DatabaseOpenDialog.cpp | 2 +- tests/TestDatabase.cpp | 4 ++-- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp index 2b5a8bf19..6e68535ad 100644 --- a/src/browser/BrowserService.cpp +++ b/src/browser/BrowserService.cpp @@ -515,20 +515,23 @@ void BrowserService::showPasswordGenerator(const KeyPairMessage& keyPairMessage) if (!m_passwordGenerator) { m_passwordGenerator = PasswordGeneratorWidget::popupGenerator(); - connect(m_passwordGenerator.data(), &PasswordGeneratorWidget::closed, m_passwordGenerator.data(), [=] { - if (!m_passwordGenerator->isPasswordGenerated()) { - auto errorMessage = browserMessageBuilder()->getErrorReply("generate-password", - ERROR_KEEPASS_ACTION_CANCELLED_OR_DENIED); - m_browserHost->sendClientMessage(keyPairMessage.socket, errorMessage); - } + connect(m_passwordGenerator.data(), + &PasswordGeneratorWidget::closed, + m_passwordGenerator.data(), + [this, keyPairMessage] { + if (!m_passwordGenerator->isPasswordGenerated()) { + auto errorMessage = browserMessageBuilder()->getErrorReply( + "generate-password", ERROR_KEEPASS_ACTION_CANCELLED_OR_DENIED); + m_browserHost->sendClientMessage(keyPairMessage.socket, errorMessage); + } - QTimer::singleShot(50, this, [&] { hideWindow(); }); - }); + QTimer::singleShot(50, this, [&] { hideWindow(); }); + }); connect(m_passwordGenerator.data(), &PasswordGeneratorWidget::appliedPassword, m_passwordGenerator.data(), - [=](const QString& password) { + [this, keyPairMessage](const QString& password) { const Parameters params{{"password", password}}; m_browserHost->sendClientMessage(keyPairMessage.socket, browserMessageBuilder()->buildResponse("generate-password", diff --git a/src/core/FileWatcher.cpp b/src/core/FileWatcher.cpp index c919a64ef..e132b8954 100644 --- a/src/core/FileWatcher.cpp +++ b/src/core/FileWatcher.cpp @@ -116,9 +116,9 @@ void FileWatcher::checkFileChanged() // Prevent reentrance m_ignoreFileChange = true; - AsyncTask::runThenCallback([=] { return calculateChecksum(); }, + AsyncTask::runThenCallback([this] { return calculateChecksum(); }, this, - [=](QByteArray checksum) { + [this](QByteArray checksum) { if (checksum != m_fileChecksum) { m_fileChecksum = checksum; m_fileChangeDelayTimer.start(0); diff --git a/src/fdosecrets/widgets/AccessControlDialog.cpp b/src/fdosecrets/widgets/AccessControlDialog.cpp index 8e3a3e1d8..f12bc46d9 100644 --- a/src/fdosecrets/widgets/AccessControlDialog.cpp +++ b/src/fdosecrets/widgets/AccessControlDialog.cpp @@ -101,7 +101,7 @@ AccessControlDialog::AccessControlDialog(QWindow* parent, connect(cancelButton, &QPushButton::clicked, this, [this]() { done(DenyAll); }); connect(allowButton, &QPushButton::clicked, this, [this]() { done(AllowSelected); }); connect(allowAllButton, &QPushButton::clicked, this, [this]() { done(AllowAll); }); - connect(detailsButton, &QPushButton::clicked, this, [=](bool checked) { + connect(detailsButton, &QPushButton::clicked, this, [this, detailsButton, detailsButtonText](bool checked) { m_ui->detailsContainer->setVisible(checked); if (checked) { detailsButton->setText(detailsButtonText + QStringLiteral(" <<")); diff --git a/src/gui/DatabaseOpenDialog.cpp b/src/gui/DatabaseOpenDialog.cpp index c4a52e2a0..98c74ce9a 100644 --- a/src/gui/DatabaseOpenDialog.cpp +++ b/src/gui/DatabaseOpenDialog.cpp @@ -83,7 +83,7 @@ DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent) void DatabaseOpenDialog::showEvent(QShowEvent* event) { QDialog::showEvent(event); - QTimer::singleShot(100, this, [=] { + QTimer::singleShot(100, this, [this] { if (m_view->isOnQuickUnlockScreen() && !m_view->unlockingDatabase()) { m_view->triggerQuickUnlock(); } diff --git a/tests/TestDatabase.cpp b/tests/TestDatabase.cpp index e3e957e79..3b20d6fc5 100644 --- a/tests/TestDatabase.cpp +++ b/tests/TestDatabase.cpp @@ -124,10 +124,10 @@ void TestDatabase::testSaveAs() QCOMPARE(spyFilePathChanged.count(), 1); QVERIFY(QFile::exists(newDbFileName)); #ifdef Q_OS_WIN - QVERIFY(!QFileInfo::QFileInfo(newDbFileName).isHidden()); + QVERIFY(!QFileInfo(newDbFileName).isHidden()); SetFileAttributes(newDbFileName.toStdString().c_str(), FILE_ATTRIBUTE_HIDDEN); QVERIFY2(db->saveAs(newDbFileName, Database::Atomic, QString(), &error), error.toLatin1()); - QVERIFY(QFileInfo::QFileInfo(newDbFileName).isHidden()); + QVERIFY(QFileInfo(newDbFileName).isHidden()); #endif QFile::remove(newDbFileName); QVERIFY(!QFile::exists(newDbFileName));