Mesh: fix -Wclazy-connect-by-name

2023-03-26 23:31:14 +02:00
parent 82b168da15
commit 6a4fdceaff
5 changed files with 172 additions and 92 deletions
--- a/src/Mod/Mesh/Gui/DlgDecimating.cpp
+++ b/src/Mod/Mesh/Gui/DlgDecimating.cpp
@@ -41,9 +41,11 @@ DlgDecimating::DlgDecimating(QWidget* parent, Qt::WindowFlags fl)
    , ui(new Ui_DlgDecimating)
 {
    ui->setupUi(this);
+    connect(ui->checkAbsoluteNumber, &QCheckBox::toggled,
+            this, &DlgDecimating::onCheckAbsoluteNumberToggled);
    ui->spinBoxReduction->setMinimumWidth(60);
-    ui->checkAbsolueNumber->setEnabled(false);
-    on_checkAbsolueNumber_toggled(false);
+    ui->checkAbsoluteNumber->setEnabled(false);
+    onCheckAbsoluteNumberToggled(false);
 }

 DlgDecimating::~DlgDecimating()
@@ -52,12 +54,12 @@ DlgDecimating::~DlgDecimating()

 bool DlgDecimating::isAbsoluteNumber() const
 {
-    return ui->checkAbsolueNumber->isChecked();
+    return ui->checkAbsoluteNumber->isChecked();
 }

 int DlgDecimating::targetNumberOfTriangles() const
 {
-    if (ui->checkAbsolueNumber->isChecked()) {
+    if (ui->checkAbsoluteNumber->isChecked()) {
        return ui->spinBoxReduction->value();
    }
    else {
@@ -68,12 +70,13 @@ int DlgDecimating::targetNumberOfTriangles() const
 void DlgDecimating::setNumberOfTriangles(int num)
 {
    numberOfTriangles = num;
-    ui->checkAbsolueNumber->setEnabled(num > 0);
-    if (num <= 0)
-        ui->checkAbsolueNumber->setChecked(false);
+    ui->checkAbsoluteNumber->setEnabled(num > 0);
+    if (num <= 0) {
+        ui->checkAbsoluteNumber->setChecked(false);
+    }
 }

-void DlgDecimating::on_checkAbsolueNumber_toggled(bool on)
+void DlgDecimating::onCheckAbsoluteNumberToggled(bool on)
 {
    ui->sliderReduction->setDisabled(on);
    ui->groupBoxTolerance->setDisabled(on);
@@ -84,13 +87,13 @@ void DlgDecimating::on_checkAbsolueNumber_toggled(bool on)
        ui->spinBoxReduction->setRange(1, numberOfTriangles);
        ui->spinBoxReduction->setValue(numberOfTriangles * (1.0 - reduction()));
        ui->spinBoxReduction->setSuffix(QString());
-        ui->checkAbsolueNumber->setText(tr("Absolute number (Maximum: %1)").arg(numberOfTriangles));
+        ui->checkAbsoluteNumber->setText(tr("Absolute number (Maximum: %1)").arg(numberOfTriangles));
    }
    else {
        ui->spinBoxReduction->setRange(0, 100);
        ui->spinBoxReduction->setValue(ui->sliderReduction->value());
        ui->spinBoxReduction->setSuffix(QString::fromLatin1("%"));
-        ui->checkAbsolueNumber->setText(tr("Absolute number"));
+        ui->checkAbsoluteNumber->setText(tr("Absolute number"));
        connect(ui->sliderReduction, qOverload<int>(&QSlider::valueChanged), ui->spinBoxReduction, &QSpinBox::setValue);
        connect(ui->spinBoxReduction, qOverload<int>(&QSpinBox::valueChanged), ui->sliderReduction, &QSlider::setValue);
    }
@@ -141,8 +144,9 @@ TaskDecimating::~TaskDecimating()
 bool TaskDecimating::accept()
 {
    std::vector<Mesh::Feature*> meshes = Gui::Selection().getObjectsOfType<Mesh::Feature>();
-    if (meshes.empty())
+    if (meshes.empty()) {
        return true;
+    }
    Gui::Selection().clearSelection();

    Gui::WaitCursor wc;
@@ -152,15 +156,18 @@ bool TaskDecimating::accept()
    float reduction = widget->reduction();
    bool absolute = widget->isAbsoluteNumber();
    int targetSize = 0;
-    if (absolute)
+    if (absolute) {
        targetSize = widget->targetNumberOfTriangles();
+    }
    for (std::vector<Mesh::Feature*>::const_iterator it = meshes.begin(); it != meshes.end(); ++it) {
        Mesh::Feature* mesh = *it;
        Mesh::MeshObject* mm = mesh->Mesh.startEditing();
-        if (absolute)
+        if (absolute) {
            mm->decimate(targetSize);
-        else
+        }
+        else {
            mm->decimate(tolerance, reduction);
+        }
        mesh->Mesh.finishEditing();
    }

--- a/src/Mod/Mesh/Gui/DlgDecimating.h
+++ b/src/Mod/Mesh/Gui/DlgDecimating.h
@@ -44,8 +44,8 @@ public:
    bool isAbsoluteNumber() const;
    int targetNumberOfTriangles() const;

-private Q_SLOTS:
-    void on_checkAbsolueNumber_toggled(bool);
+private:
+    void onCheckAbsoluteNumberToggled(bool);

 private:
    int numberOfTriangles;
--- a/src/Mod/Mesh/Gui/DlgDecimating.ui
+++ b/src/Mod/Mesh/Gui/DlgDecimating.ui
@@ -61,7 +61,7 @@
       </layout>
      </item>
      <item row="1" column="0">
-       <widget class="QCheckBox" name="checkAbsolueNumber">
+       <widget class="QCheckBox" name="checkAbsoluteNumber">
        <property name="text">
         <string>Absolute number</string>
        </property>
--- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
@@ -112,6 +112,8 @@ DlgEvaluateMeshImp::DlgEvaluateMeshImp(QWidget* parent, Qt::WindowFlags fl)
  : QDialog(parent, fl), d(new Private())
 {
    d->ui.setupUi(this);
+    setupConnections();
+
    d->ui.line->setFrameShape(QFrame::HLine);
    d->ui.line->setFrameShadow(QFrame::Sunken);
    d->ui.line_2->setFrameShape(QFrame::HLine);
@@ -129,9 +131,6 @@ DlgEvaluateMeshImp::DlgEvaluateMeshImp(QWidget* parent, Qt::WindowFlags fl)
    d->ui.line_8->setFrameShape(QFrame::HLine);
    d->ui.line_8->setFrameShadow(QFrame::Sunken);

-    connect(d->ui.buttonBox, &QDialogButtonBox::helpRequested,
-            Gui::getMainWindow(), &Gui::MainWindow::whatsThis);
-
    ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
            ("User parameter:BaseApp/Preferences/Mod/Mesh/Evaluation");
    d->checkNonManfoldPoints = hGrp->GetBool("CheckNonManifoldPoints", false);
@@ -148,7 +147,7 @@ DlgEvaluateMeshImp::DlgEvaluateMeshImp(QWidget* parent, Qt::WindowFlags fl)
    button->setText(tr("Settings..."));

    // try to attach to the active document
-    this->on_refreshButton_clicked();
+    this->onRefreshButtonClicked();
 }

 /**
@@ -177,6 +176,79 @@ DlgEvaluateMeshImp::~DlgEvaluateMeshImp()
    delete d;
 }

+void DlgEvaluateMeshImp::setupConnections()
+{
+    connect(d->ui.checkOrientationButton, &QCheckBox::clicked,
+            this, &DlgEvaluateMeshImp::onCheckOrientationButtonClicked);
+    connect(d->ui.analyzeOrientationButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onAnalyzeOrientationButtonClicked);
+    connect(d->ui.repairOrientationButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRepairOrientationButtonClicked);
+
+    connect(d->ui.checkDuplicatedFacesButton, &QCheckBox::clicked,
+            this, &DlgEvaluateMeshImp::onCheckDuplicatedFacesButtonClicked);
+    connect(d->ui.analyzeDuplicatedFacesButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onAnalyzeDuplicatedFacesButtonClicked);
+    connect(d->ui.repairDuplicatedFacesButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRepairDuplicatedFacesButtonClicked);
+
+    connect(d->ui.checkDuplicatedPointsButton, &QCheckBox::clicked,
+            this, &DlgEvaluateMeshImp::onCheckDuplicatedPointsButtonClicked);
+    connect(d->ui.analyzeDuplicatedPointsButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onAnalyzeDuplicatedPointsButtonClicked);
+    connect(d->ui.repairDuplicatedPointsButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRepairDuplicatedPointsButtonClicked);
+
+    connect(d->ui.checkNonmanifoldsButton, &QCheckBox::clicked,
+            this, &DlgEvaluateMeshImp::onCheckNonmanifoldsButtonClicked);
+    connect(d->ui.analyzeNonmanifoldsButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onAnalyzeNonmanifoldsButtonClicked);
+    connect(d->ui.repairNonmanifoldsButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRepairNonmanifoldsButtonClicked);
+
+    connect(d->ui.checkDegenerationButton, &QCheckBox::clicked,
+            this, &DlgEvaluateMeshImp::onCheckDegenerationButtonClicked);
+    connect(d->ui.analyzeDegeneratedButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onAnalyzeDegeneratedButtonClicked);
+    connect(d->ui.repairDegeneratedButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRepairDegeneratedButtonClicked);
+
+    connect(d->ui.checkIndicesButton, &QCheckBox::clicked,
+            this, &DlgEvaluateMeshImp::onCheckIndicesButtonClicked);
+    connect(d->ui.analyzeIndicesButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onAnalyzeIndicesButtonClicked);
+    connect(d->ui.repairIndicesButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRepairIndicesButtonClicked);
+
+    connect(d->ui.checkSelfIntersectionButton, &QCheckBox::clicked,
+            this, &DlgEvaluateMeshImp::onCheckSelfIntersectionButtonClicked);
+    connect(d->ui.analyzeSelfIntersectionButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onAnalyzeSelfIntersectionButtonClicked);
+    connect(d->ui.repairSelfIntersectionButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRepairSelfIntersectionButtonClicked);
+
+    connect(d->ui.checkFoldsButton, &QCheckBox::clicked,
+            this, &DlgEvaluateMeshImp::onCheckFoldsButtonClicked);
+    connect(d->ui.analyzeFoldsButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onAnalyzeFoldsButtonClicked);
+    connect(d->ui.repairFoldsButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRepairFoldsButtonClicked);
+
+    connect(d->ui.analyzeAllTogether, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onAnalyzeAllTogetherClicked);
+    connect(d->ui.repairAllTogether, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRepairAllTogetherClicked);
+
+    connect(d->ui.refreshButton, &QPushButton::clicked,
+            this, &DlgEvaluateMeshImp::onRefreshButtonClicked);
+    connect(d->ui.meshNameButton, qOverload<int>(&QComboBox::activated),
+            this, &DlgEvaluateMeshImp::onMeshNameButtonActivated);
+    connect(d->ui.buttonBox, &QDialogButtonBox::clicked,
+            this, &DlgEvaluateMeshImp::onButtonBoxClicked);
+    connect(d->ui.buttonBox, &QDialogButtonBox::helpRequested,
+            Gui::getMainWindow(), &Gui::MainWindow::whatsThis);
+}
+
 void DlgEvaluateMeshImp::changeEvent(QEvent *e)
 {
    if (e->type() == QEvent::LanguageChange) {
@@ -251,7 +323,7 @@ void DlgEvaluateMeshImp::slotDeletedDocument(const App::Document& Doc)
        // try to attach to the active document
        this->detachDocument();
        d->view = nullptr;
-        on_refreshButton_clicked();
+        onRefreshButtonClicked();
    }
 }

@@ -268,7 +340,7 @@ void DlgEvaluateMeshImp::setMesh(Mesh::Feature* m)
    for (int i=1; i<ct; i++) {
        if (d->ui.meshNameButton->itemData(i).toString() == objName) {
            d->ui.meshNameButton->setCurrentIndex(i);
-            on_meshNameButton_activated(i);
+            onMeshNameButtonActivated(i);
            break;
        }
    }
@@ -309,7 +381,7 @@ void DlgEvaluateMeshImp::removeViewProviders()
    d->vp.clear();
 }

-void DlgEvaluateMeshImp::on_meshNameButton_activated(int i)
+void DlgEvaluateMeshImp::onMeshNameButtonActivated(int i)
 {
    QString item = d->ui.meshNameButton->itemData(i).toString();

@@ -400,7 +472,7 @@ void DlgEvaluateMeshImp::cleanInformation()
    d->ui.repairAllTogether->setDisabled(true);
 }

-void DlgEvaluateMeshImp::on_refreshButton_clicked()
+void DlgEvaluateMeshImp::onRefreshButtonClicked()
 {
    // Connect to application and active document
    Gui::Document* gui = Gui::Application::Instance->activeDocument();
@@ -418,7 +490,7 @@ void DlgEvaluateMeshImp::on_refreshButton_clicked()
    refreshList();
 }

-void DlgEvaluateMeshImp::on_checkOrientationButton_clicked()
+void DlgEvaluateMeshImp::onCheckOrientationButtonClicked()
 {
    std::map<std::string, ViewProviderMeshDefects*>::iterator it = d->vp.find("MeshGui::ViewProviderMeshOrientation");
    if (it != d->vp.end()) {
@@ -429,7 +501,7 @@ void DlgEvaluateMeshImp::on_checkOrientationButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_analyzeOrientationButton_clicked()
+void DlgEvaluateMeshImp::onAnalyzeOrientationButtonClicked()
 {
    if (d->meshFeature) {
        d->ui.analyzeOrientationButton->setEnabled(false);
@@ -459,7 +531,7 @@ void DlgEvaluateMeshImp::on_analyzeOrientationButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_repairOrientationButton_clicked()
+void DlgEvaluateMeshImp::onRepairOrientationButtonClicked()
 {
    if (d->meshFeature) {
        const char* docName = App::GetApplication().getDocumentName(d->meshFeature->getDocument());
@@ -484,7 +556,7 @@ void DlgEvaluateMeshImp::on_repairOrientationButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_checkNonmanifoldsButton_clicked()
+void DlgEvaluateMeshImp::onCheckNonmanifoldsButtonClicked()
 {
    // non-manifold edges
    std::map<std::string, ViewProviderMeshDefects*>::iterator it;
@@ -506,7 +578,7 @@ void DlgEvaluateMeshImp::on_checkNonmanifoldsButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_analyzeNonmanifoldsButton_clicked()
+void DlgEvaluateMeshImp::onAnalyzeNonmanifoldsButtonClicked()
 {
    if (d->meshFeature) {
        d->ui.analyzeNonmanifoldsButton->setEnabled(false);
@@ -562,7 +634,7 @@ void DlgEvaluateMeshImp::on_analyzeNonmanifoldsButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_repairNonmanifoldsButton_clicked()
+void DlgEvaluateMeshImp::onRepairNonmanifoldsButtonClicked()
 {
    if (d->meshFeature) {
        const char* docName = App::GetApplication().getDocumentName(d->meshFeature->getDocument());
@@ -597,7 +669,7 @@ void DlgEvaluateMeshImp::on_repairNonmanifoldsButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_checkIndicesButton_clicked()
+void DlgEvaluateMeshImp::onCheckIndicesButtonClicked()
 {
    std::map<std::string, ViewProviderMeshDefects*>::iterator it = d->vp.find("MeshGui::ViewProviderMeshIndices");
    if (it != d->vp.end()) {
@@ -608,7 +680,7 @@ void DlgEvaluateMeshImp::on_checkIndicesButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_analyzeIndicesButton_clicked()
+void DlgEvaluateMeshImp::onAnalyzeIndicesButtonClicked()
 {
    if (d->meshFeature) {
        d->ui.analyzeIndicesButton->setEnabled(false);
@@ -661,7 +733,7 @@ void DlgEvaluateMeshImp::on_analyzeIndicesButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_repairIndicesButton_clicked()
+void DlgEvaluateMeshImp::onRepairIndicesButtonClicked()
 {
    if (d->meshFeature) {
        const char* docName = App::GetApplication().getDocumentName(d->meshFeature->getDocument());
@@ -686,7 +758,7 @@ void DlgEvaluateMeshImp::on_repairIndicesButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_checkDegenerationButton_clicked()
+void DlgEvaluateMeshImp::onCheckDegenerationButtonClicked()
 {
    std::map<std::string, ViewProviderMeshDefects*>::iterator it = d->vp.find("MeshGui::ViewProviderMeshDegenerations");
    if (it != d->vp.end()) {
@@ -697,7 +769,7 @@ void DlgEvaluateMeshImp::on_checkDegenerationButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_analyzeDegeneratedButton_clicked()
+void DlgEvaluateMeshImp::onAnalyzeDegeneratedButtonClicked()
 {
    if (d->meshFeature) {
        d->ui.analyzeDegeneratedButton->setEnabled(false);
@@ -727,7 +799,7 @@ void DlgEvaluateMeshImp::on_analyzeDegeneratedButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_repairDegeneratedButton_clicked()
+void DlgEvaluateMeshImp::onRepairDegeneratedButtonClicked()
 {
    if (d->meshFeature) {
        const char* docName = App::GetApplication().getDocumentName(d->meshFeature->getDocument());
@@ -752,7 +824,7 @@ void DlgEvaluateMeshImp::on_repairDegeneratedButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_checkDuplicatedFacesButton_clicked()
+void DlgEvaluateMeshImp::onCheckDuplicatedFacesButtonClicked()
 {
    std::map<std::string, ViewProviderMeshDefects*>::iterator it = d->vp.find("MeshGui::ViewProviderMeshDuplicatedFaces");
    if (it != d->vp.end()) {
@@ -763,7 +835,7 @@ void DlgEvaluateMeshImp::on_checkDuplicatedFacesButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_analyzeDuplicatedFacesButton_clicked()
+void DlgEvaluateMeshImp::onAnalyzeDuplicatedFacesButtonClicked()
 {
    if (d->meshFeature) {
        d->ui.analyzeDuplicatedFacesButton->setEnabled(false);
@@ -794,7 +866,7 @@ void DlgEvaluateMeshImp::on_analyzeDuplicatedFacesButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_repairDuplicatedFacesButton_clicked()
+void DlgEvaluateMeshImp::onRepairDuplicatedFacesButtonClicked()
 {
    if (d->meshFeature) {
        const char* docName = App::GetApplication().getDocumentName(d->meshFeature->getDocument());
@@ -819,7 +891,7 @@ void DlgEvaluateMeshImp::on_repairDuplicatedFacesButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_checkDuplicatedPointsButton_clicked()
+void DlgEvaluateMeshImp::onCheckDuplicatedPointsButtonClicked()
 {
    std::map<std::string, ViewProviderMeshDefects*>::iterator it = d->vp.find("MeshGui::ViewProviderMeshDuplicatedPoints");
    if (it != d->vp.end()) {
@@ -830,7 +902,7 @@ void DlgEvaluateMeshImp::on_checkDuplicatedPointsButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_analyzeDuplicatedPointsButton_clicked()
+void DlgEvaluateMeshImp::onAnalyzeDuplicatedPointsButtonClicked()
 {
    if (d->meshFeature) {
        d->ui.analyzeDuplicatedPointsButton->setEnabled(false);
@@ -859,7 +931,7 @@ void DlgEvaluateMeshImp::on_analyzeDuplicatedPointsButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_repairDuplicatedPointsButton_clicked()
+void DlgEvaluateMeshImp::onRepairDuplicatedPointsButtonClicked()
 {
    if (d->meshFeature) {
        const char* docName = App::GetApplication().getDocumentName(d->meshFeature->getDocument());
@@ -884,7 +956,7 @@ void DlgEvaluateMeshImp::on_repairDuplicatedPointsButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_checkSelfIntersectionButton_clicked()
+void DlgEvaluateMeshImp::onCheckSelfIntersectionButtonClicked()
 {
    std::map<std::string, ViewProviderMeshDefects*>::iterator it = d->vp.find("MeshGui::ViewProviderMeshSelfIntersections");
    if (it != d->vp.end()) {
@@ -895,7 +967,7 @@ void DlgEvaluateMeshImp::on_checkSelfIntersectionButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_analyzeSelfIntersectionButton_clicked()
+void DlgEvaluateMeshImp::onAnalyzeSelfIntersectionButtonClicked()
 {
    if (d->meshFeature) {
        d->ui.analyzeSelfIntersectionButton->setEnabled(false);
@@ -941,7 +1013,7 @@ void DlgEvaluateMeshImp::on_analyzeSelfIntersectionButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_repairSelfIntersectionButton_clicked()
+void DlgEvaluateMeshImp::onRepairSelfIntersectionButtonClicked()
 {
    if (d->meshFeature) {
        const char* docName = App::GetApplication().getDocumentName(d->meshFeature->getDocument());
@@ -960,7 +1032,7 @@ void DlgEvaluateMeshImp::on_repairSelfIntersectionButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_checkFoldsButton_clicked()
+void DlgEvaluateMeshImp::onCheckFoldsButtonClicked()
 {
    std::map<std::string, ViewProviderMeshDefects*>::iterator it = d->vp.find("MeshGui::ViewProviderMeshFolds");
    if (it != d->vp.end()) {
@@ -971,7 +1043,7 @@ void DlgEvaluateMeshImp::on_checkFoldsButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_analyzeFoldsButton_clicked()
+void DlgEvaluateMeshImp::onAnalyzeFoldsButtonClicked()
 {
    if (d->meshFeature) {
        d->ui.analyzeFoldsButton->setEnabled(false);
@@ -1015,7 +1087,7 @@ void DlgEvaluateMeshImp::on_analyzeFoldsButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_repairFoldsButton_clicked()
+void DlgEvaluateMeshImp::onRepairFoldsButtonClicked()
 {
    if (d->meshFeature) {
        const char* docName = App::GetApplication().getDocumentName(d->meshFeature->getDocument());
@@ -1042,20 +1114,21 @@ void DlgEvaluateMeshImp::on_repairFoldsButton_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_analyzeAllTogether_clicked()
+void DlgEvaluateMeshImp::onAnalyzeAllTogetherClicked()
 {
-    on_analyzeOrientationButton_clicked();
-    on_analyzeDuplicatedFacesButton_clicked();
-    on_analyzeDuplicatedPointsButton_clicked();
-    on_analyzeNonmanifoldsButton_clicked();
-    on_analyzeDegeneratedButton_clicked();
-    on_analyzeIndicesButton_clicked();
-    on_analyzeSelfIntersectionButton_clicked();
-    if (d->enableFoldsCheck)
-        on_analyzeFoldsButton_clicked();
+    onAnalyzeOrientationButtonClicked();
+    onAnalyzeDuplicatedFacesButtonClicked();
+    onAnalyzeDuplicatedPointsButtonClicked();
+    onAnalyzeNonmanifoldsButtonClicked();
+    onAnalyzeDegeneratedButtonClicked();
+    onAnalyzeIndicesButtonClicked();
+    onAnalyzeSelfIntersectionButtonClicked();
+    if (d->enableFoldsCheck) {
+        onAnalyzeFoldsButtonClicked();
+    }
 }

-void DlgEvaluateMeshImp::on_repairAllTogether_clicked()
+void DlgEvaluateMeshImp::onRepairAllTogetherClicked()
 {
    if (d->meshFeature) {
        Gui::WaitCursor wc;
@@ -1172,7 +1245,7 @@ void DlgEvaluateMeshImp::on_repairAllTogether_clicked()
    }
 }

-void DlgEvaluateMeshImp::on_buttonBox_clicked(QAbstractButton* button)
+void DlgEvaluateMeshImp::onButtonBoxClicked(QAbstractButton* button)
 {
    QDialogButtonBox::StandardButton type = d->ui.buttonBox->standardButton(button);
    if (type == QDialogButtonBox::Open) {
--- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h
+++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h
@@ -58,7 +58,7 @@ class CleanupHandler : public QObject
 public:
    CleanupHandler();

-public Q_SLOTS:
+private:
    void cleanup();
 };

@@ -85,45 +85,45 @@ private:
    /** The property of an observed object has changed */
    void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) override;

-protected Q_SLOTS:
-    void on_checkOrientationButton_clicked();
-    void on_analyzeOrientationButton_clicked();
-    void on_repairOrientationButton_clicked();
+    void setupConnections();
+    void onCheckOrientationButtonClicked();
+    void onAnalyzeOrientationButtonClicked();
+    void onRepairOrientationButtonClicked();

-    void on_checkDuplicatedFacesButton_clicked();
-    void on_analyzeDuplicatedFacesButton_clicked();
-    void on_repairDuplicatedFacesButton_clicked();
+    void onCheckDuplicatedFacesButtonClicked();
+    void onAnalyzeDuplicatedFacesButtonClicked();
+    void onRepairDuplicatedFacesButtonClicked();

-    void on_checkDuplicatedPointsButton_clicked();
-    void on_analyzeDuplicatedPointsButton_clicked();
-    void on_repairDuplicatedPointsButton_clicked();
+    void onCheckDuplicatedPointsButtonClicked();
+    void onAnalyzeDuplicatedPointsButtonClicked();
+    void onRepairDuplicatedPointsButtonClicked();

-    void on_checkNonmanifoldsButton_clicked();
-    void on_analyzeNonmanifoldsButton_clicked();
-    void on_repairNonmanifoldsButton_clicked();
+    void onCheckNonmanifoldsButtonClicked();
+    void onAnalyzeNonmanifoldsButtonClicked();
+    void onRepairNonmanifoldsButtonClicked();

-    void on_checkDegenerationButton_clicked();
-    void on_analyzeDegeneratedButton_clicked();
-    void on_repairDegeneratedButton_clicked();
+    void onCheckDegenerationButtonClicked();
+    void onAnalyzeDegeneratedButtonClicked();
+    void onRepairDegeneratedButtonClicked();

-    void on_checkIndicesButton_clicked();
-    void on_analyzeIndicesButton_clicked();
-    void on_repairIndicesButton_clicked();
+    void onCheckIndicesButtonClicked();
+    void onAnalyzeIndicesButtonClicked();
+    void onRepairIndicesButtonClicked();

-    void on_checkSelfIntersectionButton_clicked();
-    void on_analyzeSelfIntersectionButton_clicked();
-    void on_repairSelfIntersectionButton_clicked();
+    void onCheckSelfIntersectionButtonClicked();
+    void onAnalyzeSelfIntersectionButtonClicked();
+    void onRepairSelfIntersectionButtonClicked();

-    void on_checkFoldsButton_clicked();
-    void on_analyzeFoldsButton_clicked();
-    void on_repairFoldsButton_clicked();
+    void onCheckFoldsButtonClicked();
+    void onAnalyzeFoldsButtonClicked();
+    void onRepairFoldsButtonClicked();

-    void on_analyzeAllTogether_clicked();
-    void on_repairAllTogether_clicked();
+    void onAnalyzeAllTogetherClicked();
+    void onRepairAllTogetherClicked();

-    void on_refreshButton_clicked();
-    void on_meshNameButton_activated(int);
-    void on_buttonBox_clicked(QAbstractButton *);
+    void onRefreshButtonClicked();
+    void onMeshNameButtonActivated(int);
+    void onButtonBoxClicked(QAbstractButton *);

 protected:
    void refreshList();