From 52af8a5e2a245235a0c00665c43b8a2ab025d5c5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 29 Jan 2023 12:47:13 -0800 Subject: [PATCH] clang-tidy: use = default (#7999) --- src/autotype/AutoTypePlatformPlugin.h | 4 +--- src/autotype/AutoTypeSelectDialog.cpp | 4 +--- src/autotype/test/AutoTypeTestInterface.h | 4 +--- src/cli/AddGroup.cpp | 4 +--- src/cli/Command.cpp | 4 +--- src/cli/Move.cpp | 4 +--- src/cli/RemoveGroup.cpp | 4 +--- src/core/Clock.cpp | 8 ++------ src/core/Config.cpp | 4 +--- src/core/SignalMultiplexer.cpp | 4 +--- src/format/OpData01.cpp | 4 +--- src/format/OpVaultReader.cpp | 4 +--- src/gui/AboutDialog.cpp | 4 +--- src/gui/ApplicationSettingsWidget.cpp | 4 +--- src/gui/ApplicationSettingsWidget.h | 4 +--- src/gui/CategoryListWidget.cpp | 4 +--- src/gui/CloneDialog.cpp | 4 +--- src/gui/DatabaseOpenWidget.cpp | 4 +--- src/gui/DatabaseTabWidget.cpp | 4 +--- src/gui/DatabaseWidgetStateSync.cpp | 4 +--- src/gui/EditWidget.cpp | 4 +--- src/gui/EditWidgetIcons.cpp | 4 +--- src/gui/EditWidgetProperties.cpp | 4 +--- src/gui/EntryPreviewWidget.cpp | 4 +--- src/gui/FileDialog.cpp | 4 +--- src/gui/Font.h | 4 +--- src/gui/Icons.cpp | 4 +--- src/gui/SearchWidget.cpp | 4 +--- src/gui/TotpDialog.cpp | 4 +--- src/gui/TotpSetupDialog.cpp | 4 +--- src/gui/WelcomeWidget.cpp | 4 +--- src/gui/csvImport/CsvImportWidget.cpp | 4 +--- src/gui/csvImport/CsvImportWizard.cpp | 4 +--- src/gui/csvImport/CsvParserModel.cpp | 4 +--- src/gui/databasekey/KeyComponentWidget.cpp | 4 +--- src/gui/databasekey/KeyFileEditWidget.cpp | 4 +--- src/gui/databasekey/PasswordEditWidget.cpp | 4 +--- src/gui/databasekey/YubiKeyEditWidget.cpp | 4 +--- src/gui/dbsettings/DatabaseSettingsDialog.cpp | 4 +--- src/gui/dbsettings/DatabaseSettingsDialog.h | 4 +--- src/gui/dbsettings/DatabaseSettingsWidget.cpp | 4 +--- src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp | 4 +--- src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp | 4 +--- src/gui/dbsettings/DatabaseSettingsWidgetGeneral.cpp | 4 +--- src/gui/dbsettings/DatabaseSettingsWidgetMaintenance.cpp | 4 +--- .../dbsettings/DatabaseSettingsWidgetMetaDataSimple.cpp | 4 +--- src/gui/entry/EditEntryWidget.cpp | 4 +--- src/gui/entry/EntryAttachmentsWidget.cpp | 4 +--- src/gui/export/ExportDialog.cpp | 4 +--- src/gui/group/EditGroupWidget.cpp | 4 +--- src/gui/group/EditGroupWidget.h | 4 +--- src/gui/osutils/OSUtilsBase.cpp | 4 +--- src/gui/osutils/ScreenLockListener.cpp | 4 +--- src/gui/osutils/nixutils/NixUtils.cpp | 4 +--- src/gui/reports/ReportsDialog.cpp | 4 +--- src/gui/reports/ReportsDialog.h | 4 +--- src/gui/reports/ReportsWidget.cpp | 4 +--- src/gui/reports/ReportsWidgetHealthcheck.cpp | 4 +--- src/gui/reports/ReportsWidgetHibp.cpp | 4 +--- src/gui/reports/ReportsWidgetStatistics.cpp | 4 +--- src/gui/settings/SettingsWidget.cpp | 4 +--- src/gui/styles/base/BaseStyle.cpp | 4 +--- src/gui/styles/base/phantomcolor.h | 8 ++------ src/gui/tag/TagModel.cpp | 4 +--- src/gui/wizard/NewDatabaseWizard.cpp | 4 +--- src/gui/wizard/NewDatabaseWizardPage.cpp | 4 +--- src/gui/wizard/NewDatabaseWizardPageDatabaseKey.cpp | 4 +--- src/gui/wizard/NewDatabaseWizardPageEncryption.cpp | 4 +--- src/gui/wizard/NewDatabaseWizardPageMetaData.cpp | 4 +--- src/keys/drivers/YubiKeyStub.cpp | 4 +--- 70 files changed, 72 insertions(+), 216 deletions(-) diff --git a/src/autotype/AutoTypePlatformPlugin.h b/src/autotype/AutoTypePlatformPlugin.h index 7154dcdd7..1e1e7b846 100644 --- a/src/autotype/AutoTypePlatformPlugin.h +++ b/src/autotype/AutoTypePlatformPlugin.h @@ -25,9 +25,7 @@ class AutoTypePlatformInterface { public: - virtual ~AutoTypePlatformInterface() - { - } + virtual ~AutoTypePlatformInterface() = default; virtual bool isAvailable() = 0; virtual QStringList windowTitles() = 0; virtual WId activeWindow() = 0; diff --git a/src/autotype/AutoTypeSelectDialog.cpp b/src/autotype/AutoTypeSelectDialog.cpp index 38c1ac58c..317d2a720 100644 --- a/src/autotype/AutoTypeSelectDialog.cpp +++ b/src/autotype/AutoTypeSelectDialog.cpp @@ -92,9 +92,7 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent) } // Required for QScopedPointer -AutoTypeSelectDialog::~AutoTypeSelectDialog() -{ -} +AutoTypeSelectDialog::~AutoTypeSelectDialog() = default; void AutoTypeSelectDialog::setMatches(const QList& matches, const QList>& dbs, diff --git a/src/autotype/test/AutoTypeTestInterface.h b/src/autotype/test/AutoTypeTestInterface.h index 7681f2ecb..8b1b7f9ad 100644 --- a/src/autotype/test/AutoTypeTestInterface.h +++ b/src/autotype/test/AutoTypeTestInterface.h @@ -23,9 +23,7 @@ class AutoTypeTestInterface { public: - virtual ~AutoTypeTestInterface() - { - } + virtual ~AutoTypeTestInterface() = default; virtual void setActiveWindowTitle(const QString& title) = 0; virtual QString actionChars() = 0; diff --git a/src/cli/AddGroup.cpp b/src/cli/AddGroup.cpp index d323ecff8..762afa80f 100644 --- a/src/cli/AddGroup.cpp +++ b/src/cli/AddGroup.cpp @@ -29,9 +29,7 @@ AddGroup::AddGroup() positionalArguments.append({QString("group"), QObject::tr("Path of the group to add."), QString("")}); } -AddGroup::~AddGroup() -{ -} +AddGroup::~AddGroup() = default; int AddGroup::executeWithDatabase(QSharedPointer database, QSharedPointer parser) { diff --git a/src/cli/Command.cpp b/src/cli/Command.cpp index 4bba8fff9..f138fb5c8 100644 --- a/src/cli/Command.cpp +++ b/src/cli/Command.cpp @@ -103,9 +103,7 @@ Command::Command() options.append(Command::QuietOption); } -Command::~Command() -{ -} +Command::~Command() = default; QString Command::getDescriptionLine() { diff --git a/src/cli/Move.cpp b/src/cli/Move.cpp index a9ee78614..8cdf96eb9 100644 --- a/src/cli/Move.cpp +++ b/src/cli/Move.cpp @@ -30,9 +30,7 @@ Move::Move() positionalArguments.append({QString("group"), QObject::tr("Path of the destination group."), QString("")}); } -Move::~Move() -{ -} +Move::~Move() = default; int Move::executeWithDatabase(QSharedPointer database, QSharedPointer parser) { diff --git a/src/cli/RemoveGroup.cpp b/src/cli/RemoveGroup.cpp index 6455af496..15bb01c29 100644 --- a/src/cli/RemoveGroup.cpp +++ b/src/cli/RemoveGroup.cpp @@ -30,9 +30,7 @@ RemoveGroup::RemoveGroup() positionalArguments.append({QString("group"), QObject::tr("Path of the group to remove."), QString("")}); } -RemoveGroup::~RemoveGroup() -{ -} +RemoveGroup::~RemoveGroup() = default; int RemoveGroup::executeWithDatabase(QSharedPointer database, QSharedPointer parser) { diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp index c0cea7952..fcab4d2ae 100644 --- a/src/core/Clock.cpp +++ b/src/core/Clock.cpp @@ -78,13 +78,9 @@ QDateTime Clock::parse(const QString& text, const QString& format) return QDateTime::fromString(text, format); } -Clock::~Clock() -{ -} +Clock::~Clock() = default; -Clock::Clock() -{ -} +Clock::Clock() = default; QDateTime Clock::currentDateTimeUtcImpl() const { diff --git a/src/core/Config.cpp b/src/core/Config.cpp index 44896bc1c..5811b2e25 100644 --- a/src/core/Config.cpp +++ b/src/core/Config.cpp @@ -454,9 +454,7 @@ Config::Config(QObject* parent) init(configFiles.first, configFiles.second); } -Config::~Config() -{ -} +Config::~Config() = default; void Config::init(const QString& configFileName, const QString& localConfigFileName) { diff --git a/src/core/SignalMultiplexer.cpp b/src/core/SignalMultiplexer.cpp index d1ed89e30..99f7fab15 100644 --- a/src/core/SignalMultiplexer.cpp +++ b/src/core/SignalMultiplexer.cpp @@ -19,9 +19,7 @@ #include "core/Global.h" -SignalMultiplexer::SignalMultiplexer() -{ -} +SignalMultiplexer::SignalMultiplexer() = default; SignalMultiplexer::~SignalMultiplexer() { diff --git a/src/format/OpData01.cpp b/src/format/OpData01.cpp index 3ded0288c..a51ff8fdb 100644 --- a/src/format/OpData01.cpp +++ b/src/format/OpData01.cpp @@ -27,9 +27,7 @@ OpData01::OpData01(QObject* parent) { } -OpData01::~OpData01() -{ -} +OpData01::~OpData01() = default; bool OpData01::decodeBase64(QString const& b64String, const QByteArray& key, const QByteArray& hmacKey) { diff --git a/src/format/OpVaultReader.cpp b/src/format/OpVaultReader.cpp index bf9c93894..44f0d85ec 100644 --- a/src/format/OpVaultReader.cpp +++ b/src/format/OpVaultReader.cpp @@ -35,9 +35,7 @@ OpVaultReader::OpVaultReader(QObject* parent) { } -OpVaultReader::~OpVaultReader() -{ -} +OpVaultReader::~OpVaultReader() = default; Database* OpVaultReader::readDatabase(QDir& opdataDir, const QString& password) { diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp index 00d12c65e..e48fa8c49 100644 --- a/src/gui/AboutDialog.cpp +++ b/src/gui/AboutDialog.cpp @@ -327,9 +327,7 @@ AboutDialog::AboutDialog(QWidget* parent) m_ui->buttonBox->button(QDialogButtonBox::Close)->setDefault(true); } -AboutDialog::~AboutDialog() -{ -} +AboutDialog::~AboutDialog() = default; void AboutDialog::copyToClipboard() { diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp index 7972e8e0c..901afeab9 100644 --- a/src/gui/ApplicationSettingsWidget.cpp +++ b/src/gui/ApplicationSettingsWidget.cpp @@ -175,9 +175,7 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent) m_secUi->quickUnlockCheckBox->setVisible(showQuickUnlock); } -ApplicationSettingsWidget::~ApplicationSettingsWidget() -{ -} +ApplicationSettingsWidget::~ApplicationSettingsWidget() = default; void ApplicationSettingsWidget::addSettingsPage(ISettingsPage* page) { diff --git a/src/gui/ApplicationSettingsWidget.h b/src/gui/ApplicationSettingsWidget.h index e7acb37b7..5c6572173 100644 --- a/src/gui/ApplicationSettingsWidget.h +++ b/src/gui/ApplicationSettingsWidget.h @@ -30,9 +30,7 @@ namespace Ui class ISettingsPage { public: - virtual ~ISettingsPage() - { - } + virtual ~ISettingsPage() = default; virtual QString name() = 0; virtual QIcon icon() = 0; virtual QWidget* createWidget() = 0; diff --git a/src/gui/CategoryListWidget.cpp b/src/gui/CategoryListWidget.cpp index 7322c03cd..cae806f62 100644 --- a/src/gui/CategoryListWidget.cpp +++ b/src/gui/CategoryListWidget.cpp @@ -43,9 +43,7 @@ CategoryListWidget::CategoryListWidget(QWidget* parent) // clang-format on } -CategoryListWidget::~CategoryListWidget() -{ -} +CategoryListWidget::~CategoryListWidget() = default; QSize CategoryListWidget::sizeHint() const { diff --git a/src/gui/CloneDialog.cpp b/src/gui/CloneDialog.cpp index 8ce368a60..0ce2c5f2e 100644 --- a/src/gui/CloneDialog.cpp +++ b/src/gui/CloneDialog.cpp @@ -61,6 +61,4 @@ void CloneDialog::cloneEntry() close(); } -CloneDialog::~CloneDialog() -{ -} +CloneDialog::~CloneDialog() = default; diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp index 537dd6de8..882d8d057 100644 --- a/src/gui/DatabaseOpenWidget.cpp +++ b/src/gui/DatabaseOpenWidget.cpp @@ -141,9 +141,7 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent) connect(m_ui->resetQuickUnlockButton, &QPushButton::pressed, this, [this] { resetQuickUnlock(); }); } -DatabaseOpenWidget::~DatabaseOpenWidget() -{ -} +DatabaseOpenWidget::~DatabaseOpenWidget() = default; void DatabaseOpenWidget::showEvent(QShowEvent* event) { diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index 424b8010c..d4e50116f 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -68,9 +68,7 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent) connect(&m_lockDelayTimer, &QTimer::timeout, this, [this] { lockDatabases(); }); } -DatabaseTabWidget::~DatabaseTabWidget() -{ -} +DatabaseTabWidget::~DatabaseTabWidget() = default; void DatabaseTabWidget::toggleTabbar() { diff --git a/src/gui/DatabaseWidgetStateSync.cpp b/src/gui/DatabaseWidgetStateSync.cpp index 9cc22254f..7264c23df 100644 --- a/src/gui/DatabaseWidgetStateSync.cpp +++ b/src/gui/DatabaseWidgetStateSync.cpp @@ -36,9 +36,7 @@ DatabaseWidgetStateSync::DatabaseWidgetStateSync(QObject* parent) connect(qApp, &QCoreApplication::aboutToQuit, this, &DatabaseWidgetStateSync::sync); } -DatabaseWidgetStateSync::~DatabaseWidgetStateSync() -{ -} +DatabaseWidgetStateSync::~DatabaseWidgetStateSync() = default; /** * Sync state with persistent storage. diff --git a/src/gui/EditWidget.cpp b/src/gui/EditWidget.cpp index 92e221607..719656744 100644 --- a/src/gui/EditWidget.cpp +++ b/src/gui/EditWidget.cpp @@ -45,9 +45,7 @@ EditWidget::EditWidget(QWidget* parent) connect(m_ui->buttonBox, SIGNAL(clicked(QAbstractButton*)), SLOT(buttonClicked(QAbstractButton*))); } -EditWidget::~EditWidget() -{ -} +EditWidget::~EditWidget() = default; void EditWidget::addPage(const QString& labelText, const QIcon& icon, QWidget* widget) { diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp index 25542730c..e57e23c94 100644 --- a/src/gui/EditWidgetIcons.cpp +++ b/src/gui/EditWidgetIcons.cpp @@ -86,9 +86,7 @@ EditWidgetIcons::EditWidgetIcons(QWidget* parent) #endif } -EditWidgetIcons::~EditWidgetIcons() -{ -} +EditWidgetIcons::~EditWidgetIcons() = default; IconStruct EditWidgetIcons::state() { diff --git a/src/gui/EditWidgetProperties.cpp b/src/gui/EditWidgetProperties.cpp index 3e26352d3..4aea1510c 100644 --- a/src/gui/EditWidgetProperties.cpp +++ b/src/gui/EditWidgetProperties.cpp @@ -41,9 +41,7 @@ EditWidgetProperties::EditWidgetProperties(QWidget* parent) connect(m_ui->removeCustomDataButton, SIGNAL(clicked()), SLOT(removeSelectedPluginData())); } -EditWidgetProperties::~EditWidgetProperties() -{ -} +EditWidgetProperties::~EditWidgetProperties() = default; void EditWidgetProperties::setFields(const TimeInfo& timeInfo, const QUuid& uuid) { diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp index d864560dd..a3eda3f37 100644 --- a/src/gui/EntryPreviewWidget.cpp +++ b/src/gui/EntryPreviewWidget.cpp @@ -107,9 +107,7 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent) #endif } -EntryPreviewWidget::~EntryPreviewWidget() -{ -} +EntryPreviewWidget::~EntryPreviewWidget() = default; void EntryPreviewWidget::clear() { diff --git a/src/gui/FileDialog.cpp b/src/gui/FileDialog.cpp index 0d46898fb..84b19e260 100644 --- a/src/gui/FileDialog.cpp +++ b/src/gui/FileDialog.cpp @@ -21,9 +21,7 @@ FileDialog* FileDialog::m_instance(nullptr); -FileDialog::FileDialog() -{ -} +FileDialog::FileDialog() = default; QString FileDialog::getOpenFileName(QWidget* parent, const QString& caption, diff --git a/src/gui/Font.h b/src/gui/Font.h index d53f0c407..878dbb53d 100644 --- a/src/gui/Font.h +++ b/src/gui/Font.h @@ -27,9 +27,7 @@ public: static QFont fixedFont(); private: - Font() - { - } + Font() = default; }; #endif // KEEPASSX_FONT_H diff --git a/src/gui/Icons.cpp b/src/gui/Icons.cpp index 791c09bb5..2083444d7 100644 --- a/src/gui/Icons.cpp +++ b/src/gui/Icons.cpp @@ -48,9 +48,7 @@ private: Icons* Icons::m_instance(nullptr); -Icons::Icons() -{ -} +Icons::Icons() = default; QString Icons::applicationIconName() { diff --git a/src/gui/SearchWidget.cpp b/src/gui/SearchWidget.cpp index 8a04ec14f..765855cf8 100644 --- a/src/gui/SearchWidget.cpp +++ b/src/gui/SearchWidget.cpp @@ -81,9 +81,7 @@ SearchWidget::SearchWidget(QWidget* parent) } } -SearchWidget::~SearchWidget() -{ -} +SearchWidget::~SearchWidget() = default; bool SearchWidget::eventFilter(QObject* obj, QEvent* event) { diff --git a/src/gui/TotpDialog.cpp b/src/gui/TotpDialog.cpp index e856f5d6a..83d8a6973 100644 --- a/src/gui/TotpDialog.cpp +++ b/src/gui/TotpDialog.cpp @@ -53,9 +53,7 @@ TotpDialog::TotpDialog(QWidget* parent, Entry* entry) connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(copyToClipboard())); } -TotpDialog::~TotpDialog() -{ -} +TotpDialog::~TotpDialog() = default; void TotpDialog::copyToClipboard() { diff --git a/src/gui/TotpSetupDialog.cpp b/src/gui/TotpSetupDialog.cpp index 1d403a17c..ed84218c5 100644 --- a/src/gui/TotpSetupDialog.cpp +++ b/src/gui/TotpSetupDialog.cpp @@ -38,9 +38,7 @@ TotpSetupDialog::TotpSetupDialog(QWidget* parent, Entry* entry) init(); } -TotpSetupDialog::~TotpSetupDialog() -{ -} +TotpSetupDialog::~TotpSetupDialog() = default; void TotpSetupDialog::saveSettings() { diff --git a/src/gui/WelcomeWidget.cpp b/src/gui/WelcomeWidget.cpp index bb5b99ee2..916719c9d 100644 --- a/src/gui/WelcomeWidget.cpp +++ b/src/gui/WelcomeWidget.cpp @@ -51,9 +51,7 @@ WelcomeWidget::WelcomeWidget(QWidget* parent) SLOT(openDatabaseFromFile(QListWidgetItem*))); } -WelcomeWidget::~WelcomeWidget() -{ -} +WelcomeWidget::~WelcomeWidget() = default; void WelcomeWidget::openDatabaseFromFile(QListWidgetItem* item) { diff --git a/src/gui/csvImport/CsvImportWidget.cpp b/src/gui/csvImport/CsvImportWidget.cpp index b7cb7075c..6781974f5 100644 --- a/src/gui/csvImport/CsvImportWidget.cpp +++ b/src/gui/csvImport/CsvImportWidget.cpp @@ -88,9 +88,7 @@ void CsvImportWidget::skippedChanged(int rows) updateTableview(); } -CsvImportWidget::~CsvImportWidget() -{ -} +CsvImportWidget::~CsvImportWidget() = default; void CsvImportWidget::configParser() { diff --git a/src/gui/csvImport/CsvImportWizard.cpp b/src/gui/csvImport/CsvImportWizard.cpp index 4595c06d9..d0856023e 100644 --- a/src/gui/csvImport/CsvImportWizard.cpp +++ b/src/gui/csvImport/CsvImportWizard.cpp @@ -29,9 +29,7 @@ CsvImportWizard::CsvImportWizard(QWidget* parent) connect(m_parse, SIGNAL(editFinished(bool)), this, SLOT(parseFinished(bool))); } -CsvImportWizard::~CsvImportWizard() -{ -} +CsvImportWizard::~CsvImportWizard() = default; void CsvImportWizard::load(const QString& filename, Database* database) { diff --git a/src/gui/csvImport/CsvParserModel.cpp b/src/gui/csvImport/CsvParserModel.cpp index f13363c3e..45675d0c4 100644 --- a/src/gui/csvImport/CsvParserModel.cpp +++ b/src/gui/csvImport/CsvParserModel.cpp @@ -26,9 +26,7 @@ CsvParserModel::CsvParserModel(QObject* parent) { } -CsvParserModel::~CsvParserModel() -{ -} +CsvParserModel::~CsvParserModel() = default; void CsvParserModel::setFilename(const QString& filename) { diff --git a/src/gui/databasekey/KeyComponentWidget.cpp b/src/gui/databasekey/KeyComponentWidget.cpp index e0cdc0f8a..f49c10e1e 100644 --- a/src/gui/databasekey/KeyComponentWidget.cpp +++ b/src/gui/databasekey/KeyComponentWidget.cpp @@ -43,9 +43,7 @@ KeyComponentWidget::KeyComponentWidget(QWidget* parent) m_ui->stackedWidget->blockSignals(prev); } -KeyComponentWidget::~KeyComponentWidget() -{ -} +KeyComponentWidget::~KeyComponentWidget() = default; void KeyComponentWidget::setComponentAdded(bool added) { diff --git a/src/gui/databasekey/KeyFileEditWidget.cpp b/src/gui/databasekey/KeyFileEditWidget.cpp index dc38d05d7..dfaef273c 100644 --- a/src/gui/databasekey/KeyFileEditWidget.cpp +++ b/src/gui/databasekey/KeyFileEditWidget.cpp @@ -33,9 +33,7 @@ KeyFileEditWidget::KeyFileEditWidget(DatabaseSettingsWidget* parent) initComponent(); } -KeyFileEditWidget::~KeyFileEditWidget() -{ -} +KeyFileEditWidget::~KeyFileEditWidget() = default; bool KeyFileEditWidget::addToCompositeKey(QSharedPointer key) { diff --git a/src/gui/databasekey/PasswordEditWidget.cpp b/src/gui/databasekey/PasswordEditWidget.cpp index 5ed6b6328..b6d2b3ec7 100644 --- a/src/gui/databasekey/PasswordEditWidget.cpp +++ b/src/gui/databasekey/PasswordEditWidget.cpp @@ -29,9 +29,7 @@ PasswordEditWidget::PasswordEditWidget(QWidget* parent) initComponent(); } -PasswordEditWidget::~PasswordEditWidget() -{ -} +PasswordEditWidget::~PasswordEditWidget() = default; bool PasswordEditWidget::addToCompositeKey(QSharedPointer key) { diff --git a/src/gui/databasekey/YubiKeyEditWidget.cpp b/src/gui/databasekey/YubiKeyEditWidget.cpp index 2e6cf4ff3..a8c4e7843 100644 --- a/src/gui/databasekey/YubiKeyEditWidget.cpp +++ b/src/gui/databasekey/YubiKeyEditWidget.cpp @@ -33,9 +33,7 @@ YubiKeyEditWidget::YubiKeyEditWidget(QWidget* parent) connect(YubiKey::instance(), SIGNAL(detectComplete(bool)), SLOT(hardwareKeyResponse(bool)), Qt::QueuedConnection); } -YubiKeyEditWidget::~YubiKeyEditWidget() -{ -} +YubiKeyEditWidget::~YubiKeyEditWidget() = default; bool YubiKeyEditWidget::addToCompositeKey(QSharedPointer key) { diff --git a/src/gui/dbsettings/DatabaseSettingsDialog.cpp b/src/gui/dbsettings/DatabaseSettingsDialog.cpp index 6d96dd769..8bbf7fd6d 100644 --- a/src/gui/dbsettings/DatabaseSettingsDialog.cpp +++ b/src/gui/dbsettings/DatabaseSettingsDialog.cpp @@ -122,9 +122,7 @@ DatabaseSettingsDialog::DatabaseSettingsDialog(QWidget* parent) pageChanged(); } -DatabaseSettingsDialog::~DatabaseSettingsDialog() -{ -} +DatabaseSettingsDialog::~DatabaseSettingsDialog() = default; void DatabaseSettingsDialog::load(const QSharedPointer& db) { diff --git a/src/gui/dbsettings/DatabaseSettingsDialog.h b/src/gui/dbsettings/DatabaseSettingsDialog.h index 512c47a1a..7607f9f78 100644 --- a/src/gui/dbsettings/DatabaseSettingsDialog.h +++ b/src/gui/dbsettings/DatabaseSettingsDialog.h @@ -41,9 +41,7 @@ namespace Ui class IDatabaseSettingsPage { public: - virtual ~IDatabaseSettingsPage() - { - } + virtual ~IDatabaseSettingsPage() = default; virtual QString name() = 0; virtual QIcon icon() = 0; virtual QWidget* createWidget() = 0; diff --git a/src/gui/dbsettings/DatabaseSettingsWidget.cpp b/src/gui/dbsettings/DatabaseSettingsWidget.cpp index b2536f203..5c300f868 100644 --- a/src/gui/dbsettings/DatabaseSettingsWidget.cpp +++ b/src/gui/dbsettings/DatabaseSettingsWidget.cpp @@ -23,9 +23,7 @@ DatabaseSettingsWidget::DatabaseSettingsWidget(QWidget* parent) { } -DatabaseSettingsWidget::~DatabaseSettingsWidget() -{ -} +DatabaseSettingsWidget::~DatabaseSettingsWidget() = default; /** * Load the database to be configured by this page and initialize the page. diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp index 2dae5cbb5..41b4eea6d 100644 --- a/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp +++ b/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp @@ -71,9 +71,7 @@ DatabaseSettingsWidgetDatabaseKey::DatabaseSettingsWidgetDatabaseKey(QWidget* pa setLayout(vbox); } -DatabaseSettingsWidgetDatabaseKey::~DatabaseSettingsWidgetDatabaseKey() -{ -} +DatabaseSettingsWidgetDatabaseKey::~DatabaseSettingsWidgetDatabaseKey() = default; void DatabaseSettingsWidgetDatabaseKey::load(QSharedPointer db) { diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp index be13cd188..3a3495dfc 100644 --- a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp +++ b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp @@ -70,9 +70,7 @@ DatabaseSettingsWidgetEncryption::DatabaseSettingsWidgetEncryption(QWidget* pare connect(m_ui->parallelismSpinBox, SIGNAL(valueChanged(int)), SLOT(markDirty())); } -DatabaseSettingsWidgetEncryption::~DatabaseSettingsWidgetEncryption() -{ -} +DatabaseSettingsWidgetEncryption::~DatabaseSettingsWidgetEncryption() = default; #define IS_ARGON2(uuid) (uuid == KeePass2::KDF_ARGON2D || uuid == KeePass2::KDF_ARGON2ID) #define IS_AES_KDF(uuid) (uuid == KeePass2::KDF_AES_KDBX3 || uuid == KeePass2::KDF_AES_KDBX4) diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.cpp index 6bc21aec5..ac883ac7a 100644 --- a/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.cpp +++ b/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.cpp @@ -33,9 +33,7 @@ DatabaseSettingsWidgetGeneral::DatabaseSettingsWidgetGeneral(QWidget* parent) connect(m_ui->historyMaxSizeCheckBox, SIGNAL(toggled(bool)), m_ui->historyMaxSizeSpinBox, SLOT(setEnabled(bool))); } -DatabaseSettingsWidgetGeneral::~DatabaseSettingsWidgetGeneral() -{ -} +DatabaseSettingsWidgetGeneral::~DatabaseSettingsWidgetGeneral() = default; void DatabaseSettingsWidgetGeneral::initialize() { diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetMaintenance.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetMaintenance.cpp index 09650c6b0..fea6bc2a3 100644 --- a/src/gui/dbsettings/DatabaseSettingsWidgetMaintenance.cpp +++ b/src/gui/dbsettings/DatabaseSettingsWidgetMaintenance.cpp @@ -42,9 +42,7 @@ DatabaseSettingsWidgetMaintenance::DatabaseSettingsWidgetMaintenance(QWidget* pa SLOT(selectionChanged())); } -DatabaseSettingsWidgetMaintenance::~DatabaseSettingsWidgetMaintenance() -{ -} +DatabaseSettingsWidgetMaintenance::~DatabaseSettingsWidgetMaintenance() = default; void DatabaseSettingsWidgetMaintenance::populateIcons(QSharedPointer db) { diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetMetaDataSimple.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetMetaDataSimple.cpp index 0a1dccb5f..32879a75b 100644 --- a/src/gui/dbsettings/DatabaseSettingsWidgetMetaDataSimple.cpp +++ b/src/gui/dbsettings/DatabaseSettingsWidgetMetaDataSimple.cpp @@ -28,9 +28,7 @@ DatabaseSettingWidgetMetaData::DatabaseSettingWidgetMetaData(QWidget* parent) m_ui->setupUi(this); } -DatabaseSettingWidgetMetaData::~DatabaseSettingWidgetMetaData() -{ -} +DatabaseSettingWidgetMetaData::~DatabaseSettingWidgetMetaData() = default; void DatabaseSettingWidgetMetaData::initialize() { diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index b03d469e5..b0ad129d5 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -135,9 +135,7 @@ EditEntryWidget::EditEntryWidget(QWidget* parent) m_mainUi->passwordEdit->setQualityVisible(true); } -EditEntryWidget::~EditEntryWidget() -{ -} +EditEntryWidget::~EditEntryWidget() = default; void EditEntryWidget::setupMain() { diff --git a/src/gui/entry/EntryAttachmentsWidget.cpp b/src/gui/entry/EntryAttachmentsWidget.cpp index 51e72bc53..d514804f8 100644 --- a/src/gui/entry/EntryAttachmentsWidget.cpp +++ b/src/gui/entry/EntryAttachmentsWidget.cpp @@ -75,9 +75,7 @@ EntryAttachmentsWidget::EntryAttachmentsWidget(QWidget* parent) updateButtonsEnabled(); } -EntryAttachmentsWidget::~EntryAttachmentsWidget() -{ -} +EntryAttachmentsWidget::~EntryAttachmentsWidget() = default; const EntryAttachments* EntryAttachmentsWidget::attachments() const { diff --git a/src/gui/export/ExportDialog.cpp b/src/gui/export/ExportDialog.cpp index 3537505cc..6985546fa 100644 --- a/src/gui/export/ExportDialog.cpp +++ b/src/gui/export/ExportDialog.cpp @@ -44,9 +44,7 @@ ExportDialog::ExportDialog(QSharedPointer db, DatabaseTabWidget* MessageWidget::Warning); } -ExportDialog::~ExportDialog() -{ -} +ExportDialog::~ExportDialog() = default; QString ExportDialog::getStrategyName(ExportSortingStrategy strategy) { diff --git a/src/gui/group/EditGroupWidget.cpp b/src/gui/group/EditGroupWidget.cpp index 39f5bc445..1b473c1fc 100644 --- a/src/gui/group/EditGroupWidget.cpp +++ b/src/gui/group/EditGroupWidget.cpp @@ -112,9 +112,7 @@ EditGroupWidget::EditGroupWidget(QWidget* parent) setupModifiedTracking(); } -EditGroupWidget::~EditGroupWidget() -{ -} +EditGroupWidget::~EditGroupWidget() = default; void EditGroupWidget::setupModifiedTracking() { diff --git a/src/gui/group/EditGroupWidget.h b/src/gui/group/EditGroupWidget.h index 2b44b6445..8e8d2c85b 100644 --- a/src/gui/group/EditGroupWidget.h +++ b/src/gui/group/EditGroupWidget.h @@ -39,9 +39,7 @@ namespace Ui class IEditGroupPage { public: - virtual ~IEditGroupPage() - { - } + virtual ~IEditGroupPage() = default; virtual QString name() = 0; virtual QIcon icon() = 0; virtual QWidget* createWidget() = 0; diff --git a/src/gui/osutils/OSUtilsBase.cpp b/src/gui/osutils/OSUtilsBase.cpp index a8395bb74..d0d83f8f5 100644 --- a/src/gui/osutils/OSUtilsBase.cpp +++ b/src/gui/osutils/OSUtilsBase.cpp @@ -22,9 +22,7 @@ OSUtilsBase::OSUtilsBase(QObject* parent) { } -OSUtilsBase::~OSUtilsBase() -{ -} +OSUtilsBase::~OSUtilsBase() = default; bool OSUtilsBase::setPreventScreenCapture(QWindow*, bool) const { diff --git a/src/gui/osutils/ScreenLockListener.cpp b/src/gui/osutils/ScreenLockListener.cpp index 2c1ba055a..1e3e4e47c 100644 --- a/src/gui/osutils/ScreenLockListener.cpp +++ b/src/gui/osutils/ScreenLockListener.cpp @@ -25,6 +25,4 @@ ScreenLockListener::ScreenLockListener(QWidget* parent) connect(m_listener, SIGNAL(screenLocked()), this, SIGNAL(screenLocked())); } -ScreenLockListener::~ScreenLockListener() -{ -} +ScreenLockListener::~ScreenLockListener() = default; diff --git a/src/gui/osutils/nixutils/NixUtils.cpp b/src/gui/osutils/nixutils/NixUtils.cpp index 030b54582..ebbea91d3 100644 --- a/src/gui/osutils/nixutils/NixUtils.cpp +++ b/src/gui/osutils/nixutils/NixUtils.cpp @@ -83,9 +83,7 @@ NixUtils::NixUtils(QObject* parent) sessionBus.callWithCallback(msg, this, SLOT(handleColorSchemeRead(QDBusVariant))); } -NixUtils::~NixUtils() -{ -} +NixUtils::~NixUtils() = default; bool NixUtils::isDarkMode() const { diff --git a/src/gui/reports/ReportsDialog.cpp b/src/gui/reports/ReportsDialog.cpp index e1da39839..123e02c2c 100644 --- a/src/gui/reports/ReportsDialog.cpp +++ b/src/gui/reports/ReportsDialog.cpp @@ -95,9 +95,7 @@ ReportsDialog::ReportsDialog(QWidget* parent) connect(m_editEntryWidget, SIGNAL(editFinished(bool)), SLOT(switchToMainView(bool))); } -ReportsDialog::~ReportsDialog() -{ -} +ReportsDialog::~ReportsDialog() = default; void ReportsDialog::load(const QSharedPointer& db) { diff --git a/src/gui/reports/ReportsDialog.h b/src/gui/reports/ReportsDialog.h index 25cb623eb..915c20eb9 100644 --- a/src/gui/reports/ReportsDialog.h +++ b/src/gui/reports/ReportsDialog.h @@ -41,9 +41,7 @@ namespace Ui class IReportsPage { public: - virtual ~IReportsPage() - { - } + virtual ~IReportsPage() = default; virtual QString name() = 0; virtual QIcon icon() = 0; virtual QWidget* createWidget() = 0; diff --git a/src/gui/reports/ReportsWidget.cpp b/src/gui/reports/ReportsWidget.cpp index 184434116..c822f4782 100644 --- a/src/gui/reports/ReportsWidget.cpp +++ b/src/gui/reports/ReportsWidget.cpp @@ -22,9 +22,7 @@ ReportsWidget::ReportsWidget(QWidget* parent) { } -ReportsWidget::~ReportsWidget() -{ -} +ReportsWidget::~ReportsWidget() = default; /** * Load the database to be configured by this page and initialize the page. diff --git a/src/gui/reports/ReportsWidgetHealthcheck.cpp b/src/gui/reports/ReportsWidgetHealthcheck.cpp index d23829031..19da39e02 100644 --- a/src/gui/reports/ReportsWidgetHealthcheck.cpp +++ b/src/gui/reports/ReportsWidgetHealthcheck.cpp @@ -158,9 +158,7 @@ ReportsWidgetHealthcheck::ReportsWidgetHealthcheck(QWidget* parent) new QShortcut(Qt::Key_Delete, this, SLOT(deleteSelectedEntries())); } -ReportsWidgetHealthcheck::~ReportsWidgetHealthcheck() -{ -} +ReportsWidgetHealthcheck::~ReportsWidgetHealthcheck() = default; void ReportsWidgetHealthcheck::addHealthRow(QSharedPointer health, Group* group, diff --git a/src/gui/reports/ReportsWidgetHibp.cpp b/src/gui/reports/ReportsWidgetHibp.cpp index 912788a9c..d4ae1f4d6 100644 --- a/src/gui/reports/ReportsWidgetHibp.cpp +++ b/src/gui/reports/ReportsWidgetHibp.cpp @@ -79,9 +79,7 @@ ReportsWidgetHibp::ReportsWidgetHibp(QWidget* parent) new QShortcut(Qt::Key_Delete, this, SLOT(deleteSelectedEntries())); } -ReportsWidgetHibp::~ReportsWidgetHibp() -{ -} +ReportsWidgetHibp::~ReportsWidgetHibp() = default; void ReportsWidgetHibp::loadSettings(QSharedPointer db) { diff --git a/src/gui/reports/ReportsWidgetStatistics.cpp b/src/gui/reports/ReportsWidgetStatistics.cpp index 280ed4de5..e8068b564 100644 --- a/src/gui/reports/ReportsWidgetStatistics.cpp +++ b/src/gui/reports/ReportsWidgetStatistics.cpp @@ -41,9 +41,7 @@ ReportsWidgetStatistics::ReportsWidgetStatistics(QWidget* parent) m_ui->statisticsTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); } -ReportsWidgetStatistics::~ReportsWidgetStatistics() -{ -} +ReportsWidgetStatistics::~ReportsWidgetStatistics() = default; void ReportsWidgetStatistics::addStatsRow(QString name, QString value, bool bad, QString badMsg) { diff --git a/src/gui/settings/SettingsWidget.cpp b/src/gui/settings/SettingsWidget.cpp index 5053bf983..779d076c0 100644 --- a/src/gui/settings/SettingsWidget.cpp +++ b/src/gui/settings/SettingsWidget.cpp @@ -22,9 +22,7 @@ SettingsWidget::SettingsWidget(QWidget* parent) { } -SettingsWidget::~SettingsWidget() -{ -} +SettingsWidget::~SettingsWidget() = default; /** * Switch between simple mode (the default) and advanced mode. diff --git a/src/gui/styles/base/BaseStyle.cpp b/src/gui/styles/base/BaseStyle.cpp index 39663dc07..b74874bc1 100644 --- a/src/gui/styles/base/BaseStyle.cpp +++ b/src/gui/styles/base/BaseStyle.cpp @@ -773,9 +773,7 @@ namespace Phantom static MenuItemMetrics ofFontHeight(int fontHeight); private: - MenuItemMetrics() - { - } + MenuItemMetrics() = default; }; MenuItemMetrics MenuItemMetrics::ofFontHeight(int fontHeight) diff --git a/src/gui/styles/base/phantomcolor.h b/src/gui/styles/base/phantomcolor.h index f9573ba65..b99761e9f 100644 --- a/src/gui/styles/base/phantomcolor.h +++ b/src/gui/styles/base/phantomcolor.h @@ -42,9 +42,7 @@ namespace Phantom struct Rgb { qreal r, g, b; - Rgb() - { - } + Rgb() = default; Rgb(qreal r, qreal g, qreal b) : r(r) , g(g) @@ -78,9 +76,7 @@ namespace Phantom struct Hsl { qreal h, s, l; - Hsl() - { - } + Hsl() = default; Hsl(qreal h, qreal s, qreal l) : h(h) , s(s) diff --git a/src/gui/tag/TagModel.cpp b/src/gui/tag/TagModel.cpp index 99f253270..dfa4e943d 100644 --- a/src/gui/tag/TagModel.cpp +++ b/src/gui/tag/TagModel.cpp @@ -33,9 +33,7 @@ TagModel::TagModel(QObject* parent) << qMakePair(tr("Weak Passwords"), QString("is:weak")); } -TagModel::~TagModel() -{ -} +TagModel::~TagModel() = default; void TagModel::setDatabase(QSharedPointer db) { diff --git a/src/gui/wizard/NewDatabaseWizard.cpp b/src/gui/wizard/NewDatabaseWizard.cpp index 03bede632..7394e1fc5 100644 --- a/src/gui/wizard/NewDatabaseWizard.cpp +++ b/src/gui/wizard/NewDatabaseWizard.cpp @@ -63,9 +63,7 @@ NewDatabaseWizard::NewDatabaseWizard(QWidget* parent) pageFrame->setPalette(framePalette); } -NewDatabaseWizard::~NewDatabaseWizard() -{ -} +NewDatabaseWizard::~NewDatabaseWizard() = default; bool NewDatabaseWizard::validateCurrentPage() { diff --git a/src/gui/wizard/NewDatabaseWizardPage.cpp b/src/gui/wizard/NewDatabaseWizardPage.cpp index dd2d69d39..f1acd943c 100644 --- a/src/gui/wizard/NewDatabaseWizardPage.cpp +++ b/src/gui/wizard/NewDatabaseWizardPage.cpp @@ -31,9 +31,7 @@ NewDatabaseWizardPage::NewDatabaseWizardPage(QWidget* parent) connect(m_ui->advancedSettingsButton, SIGNAL(clicked()), SLOT(toggleAdvancedSettings())); } -NewDatabaseWizardPage::~NewDatabaseWizardPage() -{ -} +NewDatabaseWizardPage::~NewDatabaseWizardPage() = default; /** * Set the database settings page widget for this wizard page. diff --git a/src/gui/wizard/NewDatabaseWizardPageDatabaseKey.cpp b/src/gui/wizard/NewDatabaseWizardPageDatabaseKey.cpp index 3cd2abd31..b8847a141 100644 --- a/src/gui/wizard/NewDatabaseWizardPageDatabaseKey.cpp +++ b/src/gui/wizard/NewDatabaseWizardPageDatabaseKey.cpp @@ -27,6 +27,4 @@ NewDatabaseWizardPageDatabaseKey::NewDatabaseWizardPageDatabaseKey(QWidget* pare setSubTitle(tr("A set of credentials known only to you that protects your database.")); } -NewDatabaseWizardPageDatabaseKey::~NewDatabaseWizardPageDatabaseKey() -{ -} +NewDatabaseWizardPageDatabaseKey::~NewDatabaseWizardPageDatabaseKey() = default; diff --git a/src/gui/wizard/NewDatabaseWizardPageEncryption.cpp b/src/gui/wizard/NewDatabaseWizardPageEncryption.cpp index 743f7bcc2..d97abf1f4 100644 --- a/src/gui/wizard/NewDatabaseWizardPageEncryption.cpp +++ b/src/gui/wizard/NewDatabaseWizardPageEncryption.cpp @@ -28,6 +28,4 @@ NewDatabaseWizardPageEncryption::NewDatabaseWizardPageEncryption(QWidget* parent "Don't worry, you can change them later in the database settings.")); } -NewDatabaseWizardPageEncryption::~NewDatabaseWizardPageEncryption() -{ -} +NewDatabaseWizardPageEncryption::~NewDatabaseWizardPageEncryption() = default; diff --git a/src/gui/wizard/NewDatabaseWizardPageMetaData.cpp b/src/gui/wizard/NewDatabaseWizardPageMetaData.cpp index f4e2712fb..309895703 100644 --- a/src/gui/wizard/NewDatabaseWizardPageMetaData.cpp +++ b/src/gui/wizard/NewDatabaseWizardPageMetaData.cpp @@ -27,6 +27,4 @@ NewDatabaseWizardPageMetaData::NewDatabaseWizardPageMetaData(QWidget* parent) setSubTitle(tr("Please fill in the display name and an optional description for your new database:")); } -NewDatabaseWizardPageMetaData::~NewDatabaseWizardPageMetaData() -{ -} \ No newline at end of file +NewDatabaseWizardPageMetaData::~NewDatabaseWizardPageMetaData() = default; \ No newline at end of file diff --git a/src/keys/drivers/YubiKeyStub.cpp b/src/keys/drivers/YubiKeyStub.cpp index 5609c4b4a..d897ccd56 100644 --- a/src/keys/drivers/YubiKeyStub.cpp +++ b/src/keys/drivers/YubiKeyStub.cpp @@ -18,9 +18,7 @@ #include "YubiKey.h" -YubiKey::YubiKey() -{ -} +YubiKey::YubiKey() = default; YubiKey* YubiKey::m_instance(Q_NULLPTR);