From b2f784f1f5f5e95d1192dca911188ea90439177f Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 13 Nov 2022 16:08:46 +0100 Subject: [PATCH] Gui: fix clazy warnings: * Wclazy-connect-by-name * Wclazy-connect-3arg-lambda --- src/Gui/DlgCreateNewPreferencePackImp.cpp | 3 ++- src/Gui/DlgCreateNewPreferencePackImp.h | 2 +- src/Gui/DlgGeneralImp.cpp | 7 ++++--- src/Gui/DlgPreferencesImp.cpp | 14 ++++++++------ src/Gui/DlgPreferencesImp.h | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/Gui/DlgCreateNewPreferencePackImp.cpp b/src/Gui/DlgCreateNewPreferencePackImp.cpp index 8e41ddffd2..0ba0cd3e7a 100644 --- a/src/Gui/DlgCreateNewPreferencePackImp.cpp +++ b/src/Gui/DlgCreateNewPreferencePackImp.cpp @@ -53,6 +53,7 @@ DlgCreateNewPreferencePackImp::DlgCreateNewPreferencePackImp(QWidget* parent) ui->lineEdit->setValidator(&_nameValidator); ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); connect(ui->treeWidget, &QTreeWidget::itemChanged, this, &DlgCreateNewPreferencePackImp::onItemChanged); + connect(ui->lineEdit, &QLineEdit::textEdited, this, &DlgCreateNewPreferencePackImp::onLineEditTextEdited); } @@ -147,7 +148,7 @@ void DlgCreateNewPreferencePackImp::onItemChanged(QTreeWidgetItem* item, int col } } -void DlgCreateNewPreferencePackImp::on_lineEdit_textEdited(const QString& text) +void DlgCreateNewPreferencePackImp::onLineEditTextEdited(const QString& text) { ui->buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty()); } diff --git a/src/Gui/DlgCreateNewPreferencePackImp.h b/src/Gui/DlgCreateNewPreferencePackImp.h index f322a6cd81..0b2103cb03 100644 --- a/src/Gui/DlgCreateNewPreferencePackImp.h +++ b/src/Gui/DlgCreateNewPreferencePackImp.h @@ -64,7 +64,7 @@ protected Q_SLOTS: void onItemChanged(QTreeWidgetItem* item, int column); - void on_lineEdit_textEdited(const QString &text); + void onLineEditTextEdited(const QString &text); void accept() override; diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp index 0f2d35c659..3616f31100 100644 --- a/src/Gui/DlgGeneralImp.cpp +++ b/src/Gui/DlgGeneralImp.cpp @@ -431,11 +431,12 @@ void DlgGeneralImp::saveAsNewPreferencePack() void DlgGeneralImp::revertToSavedConfig() { revertToBackupConfigDialog = std::make_unique(this); - connect(revertToBackupConfigDialog.get(), &DlgRevertToBackupConfigImp::accepted, [this]() { + connect(revertToBackupConfigDialog.get(), &DlgRevertToBackupConfigImp::accepted, this, [this]() { auto parentDialog = qobject_cast (this->window()); - if (parentDialog) + if (parentDialog) { parentDialog->reload(); - }); + } + }); revertToBackupConfigDialog->open(); } diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp index abd272001c..d251c489d3 100644 --- a/src/Gui/DlgPreferencesImp.cpp +++ b/src/Gui/DlgPreferencesImp.cpp @@ -24,7 +24,7 @@ #ifndef _PreComp_ # include # include - +# include # include # include # include @@ -75,10 +75,12 @@ DlgPreferencesImp::DlgPreferencesImp(QWidget* parent, Qt::WindowFlags fl) ui->listBox->setFixedWidth(Base::clamp(length + 20, 108, 120)); ui->listBox->setGridSize(QSize(108, 75)); - connect(ui->buttonBox, SIGNAL (helpRequested()), - getMainWindow(), SLOT (whatsThis())); - connect(ui->listBox, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), - this, SLOT(changeGroup(QListWidgetItem *, QListWidgetItem*))); + connect(ui->buttonBox, &QDialogButtonBox::clicked, + this, &DlgPreferencesImp::onButtonBoxClicked); + connect(ui->buttonBox, &QDialogButtonBox::helpRequested, + getMainWindow(), &MainWindow::whatsThis); + connect(ui->listBox, &QListWidget::currentItemChanged, + this, &DlgPreferencesImp::changeGroup); setupPages(); @@ -316,7 +318,7 @@ void DlgPreferencesImp::accept() QDialog::accept(); } -void DlgPreferencesImp::on_buttonBox_clicked(QAbstractButton* btn) +void DlgPreferencesImp::onButtonBoxClicked(QAbstractButton* btn) { if (ui->buttonBox->standardButton(btn) == QDialogButtonBox::Apply) applyChanges(); diff --git a/src/Gui/DlgPreferencesImp.h b/src/Gui/DlgPreferencesImp.h index 6f72e4e53e..762c9a6737 100644 --- a/src/Gui/DlgPreferencesImp.h +++ b/src/Gui/DlgPreferencesImp.h @@ -133,7 +133,7 @@ protected: protected Q_SLOTS: void changeGroup(QListWidgetItem *current, QListWidgetItem *previous); - void on_buttonBox_clicked(QAbstractButton*); + void onButtonBoxClicked(QAbstractButton*); void resizeWindow(int w, int h); private: