From f336ebd1e643247208bd94f4ea75e2dd6a3c4a22 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 22 Aug 2023 11:38:29 +0200 Subject: [PATCH] RE: modernize C++: use equals default --- .../ReverseEngineering/App/AppReverseEngineering.cpp | 2 -- src/Mod/ReverseEngineering/App/ApproxSurface.cpp | 8 ++------ src/Mod/ReverseEngineering/App/ApproxSurface.h | 2 +- .../Gui/AppReverseEngineeringGui.cpp | 2 -- src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp | 12 ++---------- src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h | 1 - src/Mod/ReverseEngineering/Gui/Poisson.cpp | 12 +++--------- src/Mod/ReverseEngineering/Gui/Segmentation.cpp | 9 +-------- src/Mod/ReverseEngineering/Gui/Segmentation.h | 1 - .../ReverseEngineering/Gui/SegmentationManual.cpp | 9 +-------- src/Mod/ReverseEngineering/Gui/SegmentationManual.h | 1 - src/Mod/ReverseEngineering/Gui/Workbench.cpp | 8 ++------ 12 files changed, 12 insertions(+), 55 deletions(-) diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp index bfa59d1a8a..fe9bd4dc96 100644 --- a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp +++ b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp @@ -157,8 +157,6 @@ public: initialize("This module is the ReverseEngineering module."); // register with Python } - ~Module() override {} - private: Py::Object approxSurface(const Py::Tuple& args, const Py::Dict& kwds) { diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp index ed024b4321..a2b45b5f88 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp @@ -82,9 +82,7 @@ SplineBasisfunction::SplineBasisfunction(TColStd_Array1OfReal& vKnots, int iOrde _iOrder = iOrder; } -SplineBasisfunction::~SplineBasisfunction() -{ -} +SplineBasisfunction::~SplineBasisfunction() = default; void SplineBasisfunction::SetKnots(TColStd_Array1OfReal& vKnots, int iOrder) { @@ -133,9 +131,7 @@ BSplineBasis::BSplineBasis(TColStd_Array1OfReal& vKnots, int iOrder) { } -BSplineBasis::~BSplineBasis() -{ -} +BSplineBasis::~BSplineBasis() = default; int BSplineBasis::FindSpan(double fParam) { diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.h b/src/Mod/ReverseEngineering/App/ApproxSurface.h index f0ab0e3996..56fb1d7f05 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.h +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.h @@ -375,7 +375,7 @@ public: unsigned usUCtrlpoints=6, //Qty. of the control points in u-direction unsigned usVCtrlpoints=6); //Qty. of the control points in v-direction - ~BSplineParameterCorrection() override{} + ~BSplineParameterCorrection() override = default; protected: /** diff --git a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp index 17c8f427b9..aa4b73f7eb 100644 --- a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp +++ b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp @@ -51,8 +51,6 @@ public: initialize("This module is the ReverseEngineeringGui module."); // register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp index f1f87e6a0f..99e09e5dbe 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp @@ -48,12 +48,8 @@ class FitBSplineSurfaceWidget::Private public: Ui_FitBSplineSurface ui; App::DocumentObjectT obj; - Private() - { - } - ~Private() - { - } + Private() = default; + ~Private() = default; }; /* TRANSLATOR ReenGui::FitBSplineSurfaceWidget */ @@ -256,10 +252,6 @@ TaskFitBSplineSurface::TaskFitBSplineSurface(const App::DocumentObjectT& obj) Content.push_back(taskbox); } -TaskFitBSplineSurface::~TaskFitBSplineSurface() -{ -} - void TaskFitBSplineSurface::open() { } diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h index 38066b103a..a7005acdcd 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h @@ -58,7 +58,6 @@ class TaskFitBSplineSurface : public Gui::TaskView::TaskDialog public: explicit TaskFitBSplineSurface(const App::DocumentObjectT&); - ~TaskFitBSplineSurface() override; public: void open() override; diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.cpp b/src/Mod/ReverseEngineering/Gui/Poisson.cpp index 06ab581f7f..ac8f565561 100644 --- a/src/Mod/ReverseEngineering/Gui/Poisson.cpp +++ b/src/Mod/ReverseEngineering/Gui/Poisson.cpp @@ -41,12 +41,8 @@ class PoissonWidget::Private public: Ui_PoissonWidget ui; App::DocumentObjectT obj; - Private() - { - } - ~Private() - { - } + Private() = default; + ~Private() = default; }; /* TRANSLATOR ReenGui::PoissonWidget */ @@ -123,9 +119,7 @@ TaskPoisson::TaskPoisson(const App::DocumentObjectT& obj) Content.push_back(taskbox); } -TaskPoisson::~TaskPoisson() -{ -} +TaskPoisson::~TaskPoisson() = default; void TaskPoisson::open() { diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.cpp b/src/Mod/ReverseEngineering/Gui/Segmentation.cpp index e1c99327aa..2b57969a23 100644 --- a/src/Mod/ReverseEngineering/Gui/Segmentation.cpp +++ b/src/Mod/ReverseEngineering/Gui/Segmentation.cpp @@ -65,9 +65,7 @@ Segmentation::Segmentation(Mesh::Feature* mesh, QWidget* parent, Qt::WindowFlags ui->checkBoxSmooth->setChecked(false); } -Segmentation::~Segmentation() -{ -} +Segmentation::~Segmentation() = default; void Segmentation::accept() { @@ -260,11 +258,6 @@ TaskSegmentation::TaskSegmentation(Mesh::Feature* mesh) Content.push_back(taskbox); } -TaskSegmentation::~TaskSegmentation() -{ - // automatically deleted in the sub-class -} - bool TaskSegmentation::accept() { widget->accept(); diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.h b/src/Mod/ReverseEngineering/Gui/Segmentation.h index a237d9b6d7..666f1895ac 100644 --- a/src/Mod/ReverseEngineering/Gui/Segmentation.h +++ b/src/Mod/ReverseEngineering/Gui/Segmentation.h @@ -61,7 +61,6 @@ class TaskSegmentation : public Gui::TaskView::TaskDialog { public: explicit TaskSegmentation(Mesh::Feature* mesh); - ~TaskSegmentation() override; public: bool accept() override; diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp b/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp index 4c730ce48e..8690594da6 100644 --- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp +++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp @@ -56,9 +56,7 @@ SegmentationManual::SegmentationManual(QWidget* parent, Qt::WindowFlags fl) meshSel.setEnabledViewerSelection(false); } -SegmentationManual::~SegmentationManual() -{ -} +SegmentationManual::~SegmentationManual() = default; void SegmentationManual::setupConnections() { @@ -322,11 +320,6 @@ TaskSegmentationManual::TaskSegmentationManual() Content.push_back(taskbox); } -TaskSegmentationManual::~TaskSegmentationManual() -{ - // automatically deleted in the sub-class -} - void TaskSegmentationManual::modifyStandardButtons(QDialogButtonBox* box) { QPushButton* btn = box->button(QDialogButtonBox::Ok); diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h index dc090b83b5..7309b8779c 100644 --- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h +++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h @@ -84,7 +84,6 @@ class TaskSegmentationManual : public Gui::TaskView::TaskDialog public: TaskSegmentationManual(); - ~TaskSegmentationManual() override; public: bool accept() override; diff --git a/src/Mod/ReverseEngineering/Gui/Workbench.cpp b/src/Mod/ReverseEngineering/Gui/Workbench.cpp index 18fb2c185e..b58cde4b96 100644 --- a/src/Mod/ReverseEngineering/Gui/Workbench.cpp +++ b/src/Mod/ReverseEngineering/Gui/Workbench.cpp @@ -37,13 +37,9 @@ using namespace ReverseEngineeringGui; /// @namespace ReverseEngineeringGui @class Workbench TYPESYSTEM_SOURCE(ReverseEngineeringGui::Workbench, Gui::StdWorkbench) -Workbench::Workbench() -{ -} +Workbench::Workbench() = default; -Workbench::~Workbench() -{ -} +Workbench::~Workbench() = default; Gui::MenuItem* Workbench::setupMenuBar() const {