Mesh: fix -Wclazy-connect-by-name

src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp

@@ -49,6 +49,8 @@ DlgRegularSolidImp::DlgRegularSolidImp(QWidget* parent, Qt::WindowFlags fl)
   , ui(new Ui_DlgRegularSolid)
 {
     ui->setupUi(this);
+    connect(ui->createSolidButton, &QPushButton::clicked,
+            this, &DlgRegularSolidImp::onCreateSolidButtonClicked);
     Gui::Command::doCommand(Gui::Command::Doc, "import Mesh,BuildRegularGeoms");
 
     // set limits
@@ -114,7 +116,7 @@ void DlgRegularSolidImp::changeEvent(QEvent *e)
 /**
  * Builds a mesh solid from the currently active solid type.
  */
-void DlgRegularSolidImp::on_createSolidButton_clicked()
+void DlgRegularSolidImp::onCreateSolidButtonClicked()
 {
     try {
         Gui::WaitCursor wc;

src/Mod/Mesh/Gui/DlgRegularSolidImp.h

@@ -37,8 +37,8 @@ public:
     explicit DlgRegularSolidImp(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
     ~DlgRegularSolidImp() override;
 
-public Q_SLOTS:
-    void on_createSolidButton_clicked();
+private:
+    void onCreateSolidButtonClicked();
 
 protected:
     void changeEvent(QEvent *e) override;

src/Mod/Mesh/Gui/DlgSmoothing.cpp

@@ -48,12 +48,15 @@ DlgSmoothing::DlgSmoothing(QWidget* parent)
     bg = new QButtonGroup(this);
     bg->addButton(ui->radioButtonTaubin, 0);
     bg->addButton(ui->radioButtonLaplace, 1);
+
+    connect(ui->checkBoxSelection, &QCheckBox::toggled,
+            this, &DlgSmoothing::onCheckBoxSelectionToggled);
 #if QT_VERSION < QT_VERSION_CHECK(5,15,0)
     connect(bg, qOverload<int>(&QButtonGroup::buttonClicked),
-            this, &DlgSmoothing::method_clicked);
+            this, &DlgSmoothing::methodClicked);
 #else
-    connect(bg, &QButtonGroup::idClicked,
-            this, &DlgSmoothing::method_clicked);
+    connect(bg, qOverload<int>(&QButtonGroup::idClicked),
+            this, &DlgSmoothing::methodClicked);
 #endif
 
     ui->labelLambda->setText(QString::fromUtf8("\xce\xbb"));
@@ -70,7 +73,7 @@ DlgSmoothing::~DlgSmoothing()
     delete ui;
 }
 
-void DlgSmoothing::method_clicked(int id)
+void DlgSmoothing::methodClicked(int id)
 {
     if (bg->button(id) == ui->radioButtonTaubin) {
         ui->labelMu->setEnabled(true);
@@ -111,7 +114,7 @@ bool DlgSmoothing::smoothSelection() const
     return ui->checkBoxSelection->isChecked();
 }
 
-void DlgSmoothing::on_checkBoxSelection_toggled(bool on)
+void DlgSmoothing::onCheckBoxSelectionToggled(bool on)
 {
     Q_EMIT toggledSelection(on);
 }
@@ -129,9 +132,9 @@ SmoothingDialog::SmoothingDialog(QWidget* parent, Qt::WindowFlags fl)
     buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 
     connect(buttonBox, &QDialogButtonBox::accepted,
-            this, &SmoothingDialog::accept);
+            this, &QDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected,
-            this, &SmoothingDialog::reject);
+            this, &QDialog::reject);
 
     hboxLayout->addWidget(widget);
     hboxLayout->addWidget(buttonBox);
@@ -162,7 +165,7 @@ TaskSmoothing::TaskSmoothing()
     Content.push_back(tasksel);
 
     connect(widget, &DlgSmoothing::toggledSelection,
-            tasksel, &Gui::TaskView::TaskBox::setVisible);
+            tasksel, &QWidget::setVisible);
 }
 
 TaskSmoothing::~TaskSmoothing()

src/Mod/Mesh/Gui/DlgSmoothing.h

@@ -57,9 +57,9 @@ public:
     Smooth method() const;
     bool smoothSelection() const;
 
-private Q_SLOTS:
-    void method_clicked(int);
-    void on_checkBoxSelection_toggled(bool);
+private:
+    void methodClicked(int);
+    void onCheckBoxSelectionToggled(bool);
 
 Q_SIGNALS:
     void toggledSelection(bool);

src/Mod/Mesh/Gui/RemeshGmsh.cpp

@@ -30,6 +30,7 @@
 
 #include <App/Application.h>
 #include <App/Document.h>
+#include <App/DocumentObserver.h>
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
 #include <Base/Stream.h>
@@ -73,17 +74,8 @@ GmshWidget::GmshWidget(QWidget* parent, Qt::WindowFlags fl)
   : QWidget(parent, fl)
   , d(new Private(parent))
 {
-    connect(&d->gmsh, &QProcess::started, this, &GmshWidget::started);
-    connect(&d->gmsh, qOverload<int, QProcess::ExitStatus>(&QProcess::finished),
-            this, &GmshWidget::finished);
-    connect(&d->gmsh, &QProcess::errorOccurred,
-            this, &GmshWidget::errorOccurred);
-    connect(&d->gmsh, &QProcess::readyReadStandardError,
-            this, &GmshWidget::readyReadStandardError);
-    connect(&d->gmsh, &QProcess::readyReadStandardOutput,
-            this, &GmshWidget::readyReadStandardOutput);
-
     d->ui.setupUi(this);
+    setupConnections();
     d->ui.fileChooser->onRestore();
     d->syntax = new Gui::DockWnd::ReportHighlighter(d->ui.outputWindow);
     d->ui.outputWindow->setReadOnly(true);
@@ -114,6 +106,23 @@ GmshWidget::~GmshWidget()
     d->ui.fileChooser->onSave();
 }
 
+void GmshWidget::setupConnections()
+{
+    connect(&d->gmsh, &QProcess::started, this, &GmshWidget::started);
+    connect(&d->gmsh, qOverload<int, QProcess::ExitStatus>(&QProcess::finished),
+            this, &GmshWidget::finished);
+    connect(&d->gmsh, &QProcess::errorOccurred,
+            this, &GmshWidget::errorOccurred);
+    connect(&d->gmsh, &QProcess::readyReadStandardError,
+            this, &GmshWidget::readyReadStandardError);
+    connect(&d->gmsh, &QProcess::readyReadStandardOutput,
+            this, &GmshWidget::readyReadStandardOutput);
+    connect(d->ui.killButton, &QPushButton::clicked,
+            this, &GmshWidget::onKillButtonClicked);
+    connect(d->ui.clearButton, &QPushButton::clicked,
+            this, &GmshWidget::onClearButtonClicked);
+}
+
 void GmshWidget::changeEvent(QEvent *e)
 {
     if (e->type() == QEvent::LanguageChange) {
@@ -202,7 +211,7 @@ void GmshWidget::readyReadStandardOutput()
     d->appendText(text, false);
 }
 
-void GmshWidget::on_killButton_clicked()
+void GmshWidget::onKillButtonClicked()
 {
     if (d->gmsh.state() == QProcess::Running) {
         d->gmsh.kill();
@@ -211,7 +220,7 @@ void GmshWidget::on_killButton_clicked()
     }
 }
 
-void GmshWidget::on_clearButton_clicked()
+void GmshWidget::onClearButtonClicked()
 {
     d->ui.outputWindow->clear();
 }
@@ -257,7 +266,7 @@ void GmshWidget::errorOccurred(QProcess::ProcessError error)
 
 void GmshWidget::reject()
 {
-    on_killButton_clicked();
+    onKillButtonClicked();
 }
 
 // -------------------------------------------------

src/Mod/Mesh/Gui/RemeshGmsh.h

@@ -65,12 +65,13 @@ protected:
     virtual bool writeProject(QString& inpFile, QString& outFile);
     virtual bool loadOutput();
 
-private Q_SLOTS:
+private:
+    void setupConnections();
     void started();
     void finished(int exitCode, QProcess::ExitStatus exitStatus);
     void errorOccurred(QProcess::ProcessError error);
-    void on_killButton_clicked();
-    void on_clearButton_clicked();
+    void onKillButtonClicked();
+    void onClearButtonClicked();
 
     void readyReadStandardError();
     void readyReadStandardOutput();

src/Mod/Mesh/Gui/RemoveComponents.cpp

@@ -40,6 +40,7 @@ RemoveComponents::RemoveComponents(QWidget* parent, Qt::WindowFlags fl)
 {
     ui = new Ui_RemoveComponents;
     ui->setupUi(this);
+    setupConnections();
     ui->spSelectComp->setRange(1, INT_MAX);
     ui->spSelectComp->setValue(10);
     ui->spDeselectComp->setRange(1, INT_MAX);
@@ -57,6 +58,34 @@ RemoveComponents::~RemoveComponents()
     delete ui;
 }
 
+void RemoveComponents::setupConnections()
+{
+    connect(ui->selectRegion, &QPushButton::clicked,
+            this, &RemoveComponents::onSelectRegionClicked);
+    connect(ui->selectAll, &QPushButton::clicked,
+            this, &RemoveComponents::onSelectAllClicked);
+    connect(ui->selectComponents, &QPushButton::clicked,
+            this, &RemoveComponents::onSelectComponentsClicked);
+    connect(ui->selectTriangle, &QPushButton::clicked,
+            this, &RemoveComponents::onSelectTriangleClicked);
+    connect(ui->deselectRegion, &QPushButton::clicked,
+            this, &RemoveComponents::onDeselectRegionClicked);
+    connect(ui->deselectAll, &QPushButton::clicked,
+            this, &RemoveComponents::onDeselectAllClicked);
+    connect(ui->deselectComponents, &QPushButton::clicked,
+            this, &RemoveComponents::onDeselectComponentsClicked);
+    connect(ui->deselectTriangle, &QPushButton::clicked,
+            this, &RemoveComponents::onDeselectTriangleClicked);
+    connect(ui->visibleTriangles, &QCheckBox::toggled,
+            this, &RemoveComponents::onVisibleTrianglesToggled);
+    connect(ui->screenTriangles, &QCheckBox::toggled,
+            this, &RemoveComponents::onScreenTrianglesToggled);
+    connect(ui->cbSelectComp, &QCheckBox::toggled,
+            this, &RemoveComponents::onSelectCompToggled);
+    connect(ui->cbDeselectComp, &QCheckBox::toggled,
+            this, &RemoveComponents::onDeselectCompToggled);
+}
+
 void RemoveComponents::changeEvent(QEvent *e)
 {
     if (e->type() == QEvent::LanguageChange) {
@@ -65,58 +94,58 @@ void RemoveComponents::changeEvent(QEvent *e)
     QWidget::changeEvent(e);
 }
 
-void RemoveComponents::on_selectRegion_clicked()
+void RemoveComponents::onSelectRegionClicked()
 {
     meshSel.startSelection();
 }
 
-void RemoveComponents::on_deselectRegion_clicked()
+void RemoveComponents::onDeselectRegionClicked()
 {
     meshSel.startDeselection();
 }
 
-void RemoveComponents::on_selectAll_clicked()
+void RemoveComponents::onSelectAllClicked()
 {
     // select the complete meshes
     meshSel.fullSelection();
 }
 
-void RemoveComponents::on_deselectAll_clicked()
+void RemoveComponents::onDeselectAllClicked()
 {
     // deselect all meshes
     meshSel.clearSelection();
 }
 
-void RemoveComponents::on_selectComponents_clicked()
+void RemoveComponents::onSelectComponentsClicked()
 {
     // select components up to a certain size
     int size = ui->spSelectComp->value();
     meshSel.selectComponent(size);
 }
 
-void RemoveComponents::on_deselectComponents_clicked()
+void RemoveComponents::onDeselectComponentsClicked()
 {
     // deselect components from a certain size on
     int size = ui->spDeselectComp->value();
     meshSel.deselectComponent(size);
 }
 
-void RemoveComponents::on_visibleTriangles_toggled(bool on)
+void RemoveComponents::onVisibleTrianglesToggled(bool on)
 {
     meshSel.setCheckOnlyVisibleTriangles(on);
 }
 
-void RemoveComponents::on_screenTriangles_toggled(bool on)
+void RemoveComponents::onScreenTrianglesToggled(bool on)
 {
     meshSel.setCheckOnlyPointToUserTriangles(on);
 }
 
-void RemoveComponents::on_cbSelectComp_toggled(bool on)
+void RemoveComponents::onSelectCompToggled(bool on)
 {
     meshSel.setAddComponentOnClick(on);
 }
 
-void RemoveComponents::on_cbDeselectComp_toggled(bool on)
+void RemoveComponents::onDeselectCompToggled(bool on)
 {
     meshSel.setRemoveComponentOnClick(on);
 }
@@ -140,13 +169,13 @@ void RemoveComponents::invertSelection()
     meshSel.invertSelection();
 }
 
-void RemoveComponents::on_selectTriangle_clicked()
+void RemoveComponents::onSelectTriangleClicked()
 {
     meshSel.selectTriangle();
     meshSel.setAddComponentOnClick(ui->cbSelectComp->isChecked());
 }
 
-void RemoveComponents::on_deselectTriangle_clicked()
+void RemoveComponents::onDeselectTriangleClicked()
 {
     meshSel.deselectTriangle();
     meshSel.setRemoveComponentOnClick(ui->cbDeselectComp->isChecked());

src/Mod/Mesh/Gui/RemoveComponents.h

@@ -27,6 +27,7 @@
 #include <QDialog>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+#include <Mod/Mesh/MeshGlobal.h>
 #include "MeshSelection.h"
 
 namespace MeshGui {
@@ -48,23 +49,26 @@ public:
     void deleteSelection();
     void invertSelection();
 
-public Q_SLOTS:
-    void on_selectRegion_clicked();
-    void on_selectAll_clicked();
-    void on_selectComponents_clicked();
-    void on_selectTriangle_clicked();
-    void on_deselectRegion_clicked();
-    void on_deselectAll_clicked();
-    void on_deselectComponents_clicked();
-    void on_deselectTriangle_clicked();
-    void on_visibleTriangles_toggled(bool);
-    void on_screenTriangles_toggled(bool);
-    void on_cbSelectComp_toggled(bool);
-    void on_cbDeselectComp_toggled(bool);
+public:
+    void onSelectRegionClicked();
+    void onSelectAllClicked();
+    void onSelectComponentsClicked();
+    void onSelectTriangleClicked();
+    void onDeselectRegionClicked();
+    void onDeselectAllClicked();
+    void onDeselectComponentsClicked();
+    void onDeselectTriangleClicked();
+    void onVisibleTrianglesToggled(bool);
+    void onScreenTrianglesToggled(bool);
+    void onSelectCompToggled(bool);
+    void onDeselectCompToggled(bool);
 
 protected:
     void changeEvent(QEvent *e) override;
 
+private:
+    void setupConnections();
+
 private:
     Ui_RemoveComponents* ui;
     MeshSelection meshSel;

src/Mod/Mesh/Gui/SegmentationBestFit.cpp

@@ -221,9 +221,12 @@ ParametersDialog::ParametersDialog(std::vector<float>& val, FitParameter* fitPar
         ++index;
     }
 
-    QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, &ParametersDialog::accept);
-    QObject::connect(buttonBox, &QDialogButtonBox::rejected, this, &ParametersDialog::reject);
-    QMetaObject::connectSlotsByName(this);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &ParametersDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &ParametersDialog::reject);
+    connect(regionButton, &QPushButton::clicked, this, &ParametersDialog::onRegionClicked);
+    connect(singleButton, &QPushButton::clicked, this, &ParametersDialog::onSingleClicked);
+    connect(clearButton, &QPushButton::clicked, this, &ParametersDialog::onClearClicked);
+    connect(computeButton, &QPushButton::clicked, this, &ParametersDialog::onComputeClicked);
 
     Gui::SelectionObject obj(mesh);
     std::vector<Gui::SelectionObject> sel;
@@ -242,22 +245,22 @@ ParametersDialog::~ParametersDialog()
     delete fitParameter;
 }
 
-void ParametersDialog::on_region_clicked()
+void ParametersDialog::onRegionClicked()
 {
     meshSel.startSelection();
 }
 
-void ParametersDialog::on_single_clicked()
+void ParametersDialog::onSingleClicked()
 {
     meshSel.selectTriangle();
 }
 
-void ParametersDialog::on_clear_clicked()
+void ParametersDialog::onClearClicked()
 {
     meshSel.clearSelection();
 }
 
-void ParametersDialog::on_compute_clicked()
+void ParametersDialog::onComputeClicked()
 {
     const Mesh::MeshObject& kernel = myMesh->Mesh.getValue();
     if (kernel.hasSelectedFacets()) {
@@ -310,6 +313,8 @@ SegmentationBestFit::SegmentationBestFit(Mesh::Feature* mesh, QWidget* parent, Q
 {
     ui = new Ui_SegmentationBestFit;
     ui->setupUi(this);
+    setupConnections();
+
     ui->numPln->setRange(1, INT_MAX);
     ui->numPln->setValue(100);
     ui->numCyl->setRange(1, INT_MAX);
@@ -329,7 +334,17 @@ SegmentationBestFit::~SegmentationBestFit()
     delete ui;
 }
 
-void SegmentationBestFit::on_planeParameters_clicked()
+void SegmentationBestFit::setupConnections()
+{
+    connect(ui->planeParameters, &QPushButton::clicked,
+            this, &SegmentationBestFit::onPlaneParametersClicked);
+    connect(ui->cylinderParameters, &QPushButton::clicked,
+            this, &SegmentationBestFit::onCylinderParametersClicked);
+    connect(ui->sphereParameters, &QPushButton::clicked,
+            this, &SegmentationBestFit::onSphereParametersClicked);
+}
+
+void SegmentationBestFit::onPlaneParametersClicked()
 {
     ParameterList list;
     std::vector<float> p = planeParameter;
@@ -355,7 +370,7 @@ void SegmentationBestFit::on_planeParameters_clicked()
     dialog->show();
 }
 
-void SegmentationBestFit::on_cylinderParameters_clicked()
+void SegmentationBestFit::onCylinderParametersClicked()
 {
     ParameterList list;
     std::vector<float> p = cylinderParameter;
@@ -383,7 +398,7 @@ void SegmentationBestFit::on_cylinderParameters_clicked()
     dialog->show();
 }
 
-void SegmentationBestFit::on_sphereParameters_clicked()
+void SegmentationBestFit::onSphereParametersClicked()
 {
     ParameterList list;
     std::vector<float> p = sphereParameter;

src/Mod/Mesh/Gui/SegmentationBestFit.h

@@ -29,6 +29,7 @@
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 
+#include <Mod/Mesh/MeshGlobal.h>
 #include "MeshSelection.h"
 
 
@@ -64,11 +65,11 @@ public:
     void accept() override;
     void reject() override;
 
-private Q_SLOTS:
-    void on_region_clicked();
-    void on_single_clicked();
-    void on_clear_clicked();
-    void on_compute_clicked();
+private:
+    void onRegionClicked();
+    void onSingleClicked();
+    void onClearClicked();
+    void onComputeClicked();
 
 private:
     std::vector<float>& values;
@@ -91,10 +92,11 @@ public:
 protected:
     void changeEvent(QEvent *e) override;
 
-private Q_SLOTS:
-    void on_planeParameters_clicked();
-    void on_cylinderParameters_clicked();
-    void on_sphereParameters_clicked();
+private:
+    void setupConnections();
+    void onPlaneParametersClicked();
+    void onCylinderParametersClicked();
+    void onSphereParametersClicked();
 
 private:
     std::vector<float> planeParameter;

src/Mod/Mesh/Gui/Selection.cpp

@@ -34,6 +34,7 @@ Selection::Selection(QWidget* parent)
     : QWidget(parent), ui(new Ui_Selection())
 {
     ui->setupUi(this);
+    setupConnections();
     ui->addSelection->installEventFilter(this);
     ui->clearSelection->installEventFilter(this);
 
@@ -53,6 +54,18 @@ Selection::~Selection()
     meshSel.setEnabledViewerSelection(true);
 }
 
+void Selection::setupConnections()
+{
+    connect(ui->addSelection, &QPushButton::clicked,
+            this, &Selection::onAddSelectionClicked);
+    connect(ui->clearSelection, &QPushButton::clicked,
+            this, &Selection::onClearSelectionClicked);
+    connect(ui->visibleTriangles, &QPushButton::clicked,
+            this, &Selection::onVisibleTrianglesToggled);
+    connect(ui->screenTriangles, &QPushButton::clicked,
+            this, &Selection::onScreenTrianglesToggled);
+}
+
 void Selection::setObjects(const std::vector<Gui::SelectionObject>& o)
 {
     meshSel.setObjects(o);
@@ -85,22 +98,22 @@ bool Selection::eventFilter(QObject* o, QEvent* e)
     return false;
 }
 
-void Selection::on_addSelection_clicked()
+void Selection::onAddSelectionClicked()
 {
     meshSel.startSelection();
 }
 
-void Selection::on_clearSelection_clicked()
+void Selection::onClearSelectionClicked()
 {
     meshSel.clearSelection();
 }
 
-void Selection::on_visibleTriangles_toggled(bool on)
+void Selection::onVisibleTrianglesToggled(bool on)
 {
     meshSel.setCheckOnlyVisibleTriangles(on);
 }
 
-void Selection::on_screenTriangles_toggled(bool on)
+void Selection::onScreenTrianglesToggled(bool on)
 {
     meshSel.setCheckOnlyPointToUserTriangles(on);
 }

src/Mod/Mesh/Gui/Selection.h

@@ -45,11 +45,12 @@ public:
     std::vector<App::DocumentObject*> getObjects() const;
     bool eventFilter(QObject*, QEvent*) override;
 
-private Q_SLOTS:
-    void on_addSelection_clicked();
-    void on_clearSelection_clicked();
-    void on_visibleTriangles_toggled(bool);
-    void on_screenTriangles_toggled(bool);
+private:
+    void setupConnections();
+    void onAddSelectionClicked();
+    void onClearSelectionClicked();
+    void onVisibleTrianglesToggled(bool);
+    void onScreenTrianglesToggled(bool);
 
 private:
     MeshSelection meshSel;