diff --git a/src/Mod/Import/App/ExportOCAF.cpp b/src/Mod/Import/App/ExportOCAF.cpp index ea7777495c..5d8a91d00f 100644 --- a/src/Mod/Import/App/ExportOCAF.cpp +++ b/src/Mod/Import/App/ExportOCAF.cpp @@ -85,9 +85,7 @@ ExportOCAF::ExportOCAF(Handle(TDocStd_Document) h, bool explicitPlacement) } } -ExportOCAF::~ExportOCAF() -{ -} +ExportOCAF::~ExportOCAF() = default; std::vector ExportOCAF::filterPart(App::Part* part) const { diff --git a/src/Mod/Import/App/ImportOCAF.cpp b/src/Mod/Import/App/ImportOCAF.cpp index b140d91f9a..dbeda28c26 100644 --- a/src/Mod/Import/App/ImportOCAF.cpp +++ b/src/Mod/Import/App/ImportOCAF.cpp @@ -90,9 +90,7 @@ ImportOCAF::ImportOCAF(Handle(TDocStd_Document) h, App::Document* d, const std:: aColorTool = XCAFDoc_DocumentTool::ColorTool(pDoc->Main()); } -ImportOCAF::~ImportOCAF() -{ -} +ImportOCAF::~ImportOCAF() = default; void ImportOCAF::tryPlacementFromLoc(App::GeoFeature* part, const TopLoc_Location& part_loc) { @@ -483,9 +481,7 @@ ImportXCAF::ImportXCAF(Handle(TDocStd_Document) h, App::Document* d, const std:: hColors = XCAFDoc_DocumentTool::ColorTool(hdoc->Main()); } -ImportXCAF::~ImportXCAF() -{ -} +ImportXCAF::~ImportXCAF() = default; void ImportXCAF::loadShapes() { diff --git a/src/Mod/Import/App/ImportOCAF2.cpp b/src/Mod/Import/App/ImportOCAF2.cpp index 6e6faa7253..d17ca5ce76 100644 --- a/src/Mod/Import/App/ImportOCAF2.cpp +++ b/src/Mod/Import/App/ImportOCAF2.cpp @@ -185,9 +185,7 @@ ImportOCAF2::ImportOCAF2(Handle(TDocStd_Document) h, App::Document* d, const std setUseLinkGroup(options.useLinkGroup); } -ImportOCAF2::~ImportOCAF2() -{ -} +ImportOCAF2::~ImportOCAF2() = default; ImportOCAFOptions ImportOCAF2::customImportOptions() { diff --git a/src/Mod/Import/App/StepShape.cpp b/src/Mod/Import/App/StepShape.cpp index 52260a40ef..d371895b55 100644 --- a/src/Mod/Import/App/StepShape.cpp +++ b/src/Mod/Import/App/StepShape.cpp @@ -40,14 +40,9 @@ using namespace Import; -StepShape::StepShape() -{ -} +StepShape::StepShape() = default; - -StepShape::~StepShape() -{ -} +StepShape::~StepShape() = default; int StepShape::read(const char* fileName) { diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.cpp b/src/Mod/Import/App/dxf/ImpExpDxf.cpp index 06c2ef363e..3366f173d1 100644 --- a/src/Mod/Import/App/dxf/ImpExpDxf.cpp +++ b/src/Mod/Import/App/dxf/ImpExpDxf.cpp @@ -465,9 +465,7 @@ ImpExpDxfWrite::ImpExpDxfWrite(std::string filepath) : setOptions(); } -ImpExpDxfWrite::~ImpExpDxfWrite() -{ -} +ImpExpDxfWrite::~ImpExpDxfWrite() = default; void ImpExpDxfWrite::setOptions() { diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp index 778c08d1a8..dafa4af60e 100644 --- a/src/Mod/Import/Gui/AppImportGuiPy.cpp +++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp @@ -372,8 +372,6 @@ public: initialize("This module is the ImportGui module."); // register with Python } - ~Module() override {} - private: Py::Object insert(const Py::Tuple& args, const Py::Dict &kwds) { diff --git a/src/Mod/Import/Gui/Workbench.cpp b/src/Mod/Import/Gui/Workbench.cpp index 7369f3c2a0..8a31896fdd 100644 --- a/src/Mod/Import/Gui/Workbench.cpp +++ b/src/Mod/Import/Gui/Workbench.cpp @@ -31,13 +31,9 @@ using namespace ImportGui; /// @namespace ImportGui @class Workbench TYPESYSTEM_SOURCE(ImportGui::Workbench, Gui::StdWorkbench) -Workbench::Workbench() -{ -} +Workbench::Workbench() = default; -Workbench::~Workbench() -{ -} +Workbench::~Workbench() = default; Gui::ToolBarItem* Workbench::setupToolBars() const { diff --git a/src/Mod/Measure/App/AppMeasure.cpp b/src/Mod/Measure/App/AppMeasure.cpp index 157abda374..4be22df894 100644 --- a/src/Mod/Measure/App/AppMeasure.cpp +++ b/src/Mod/Measure/App/AppMeasure.cpp @@ -38,8 +38,6 @@ public: initialize("This module is the Measure module."); // register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp index b20b68743b..3c4c6e20f7 100644 --- a/src/Mod/Measure/App/Measurement.cpp +++ b/src/Mod/Measure/App/Measurement.cpp @@ -59,10 +59,7 @@ Measurement::Measurement() References3D.setScope(App::LinkScope::Global); } -Measurement::~Measurement() -{ - -} +Measurement::~Measurement() = default; void Measurement::clear() { diff --git a/src/Mod/MeshPart/App/AppMeshPartPy.cpp b/src/Mod/MeshPart/App/AppMeshPartPy.cpp index 05eb911083..7814e5d293 100644 --- a/src/Mod/MeshPart/App/AppMeshPartPy.cpp +++ b/src/Mod/MeshPart/App/AppMeshPartPy.cpp @@ -140,8 +140,6 @@ public: initialize("This module is the MeshPart module."); // register with Python } - ~Module() override {} - private: Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override { diff --git a/src/Mod/MeshPart/App/CurveProjector.cpp b/src/Mod/MeshPart/App/CurveProjector.cpp index bd92273d32..71742a05b5 100644 --- a/src/Mod/MeshPart/App/CurveProjector.cpp +++ b/src/Mod/MeshPart/App/CurveProjector.cpp @@ -672,10 +672,6 @@ MeshProjection::MeshProjection(const MeshKernel& rMesh) { } -MeshProjection::~MeshProjection() -{ -} - void MeshProjection::discretize(const TopoDS_Edge& aEdge, std::vector& polyline, std::size_t minPoints) const { BRepAdaptor_Curve clCurve(aEdge); diff --git a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h index 4fb0d5ff37..63fdd1b4b5 100644 --- a/src/Mod/MeshPart/App/CurveProjector.h +++ b/src/Mod/MeshPart/App/CurveProjector.h @@ -52,7 +52,7 @@ class MeshPartExport CurveProjector { public: CurveProjector(const TopoDS_Shape &aShape, const MeshKernel &pMesh); - virtual ~CurveProjector() {} + virtual ~CurveProjector() = default; struct FaceSplitEdge { @@ -89,7 +89,7 @@ class MeshPartExport CurveProjectorShape: public CurveProjector { public: CurveProjectorShape(const TopoDS_Shape &aShape, const MeshKernel &pMesh); - ~CurveProjectorShape() override {} + ~CurveProjectorShape() override = default; void projectCurve(const TopoDS_Edge& aEdge, std::vector &vSplitEdges); @@ -110,7 +110,7 @@ class MeshPartExport CurveProjectorSimple: public CurveProjector { public: CurveProjectorSimple(const TopoDS_Shape &aShape, const MeshKernel &pMesh); - ~CurveProjectorSimple() override {} + ~CurveProjectorSimple() override = default; /// helper to discredicice a Edge... void GetSampledCurves( const TopoDS_Edge& aEdge, std::vector& rclPoints, unsigned long ulNbOfPoints = 30); @@ -139,7 +139,7 @@ public: }; CurveProjectorWithToolMesh(const TopoDS_Shape &aShape, const MeshKernel &pMesh,MeshKernel &rToolMesh); - ~CurveProjectorWithToolMesh() override {} + ~CurveProjectorWithToolMesh() override = default; void makeToolMesh(const TopoDS_Edge& aEdge,std::vector &cVAry ); @@ -174,10 +174,7 @@ public: std::vector points; }; - /// Construction explicit MeshProjection(const MeshKernel& rMesh); - /// Destruction - ~MeshProjection(); /** * @brief findSectionParameters diff --git a/src/Mod/MeshPart/App/MeshFlattening.h b/src/Mod/MeshPart/App/MeshFlattening.h index 38f8155129..0ef9a6a16a 100644 --- a/src/Mod/MeshPart/App/MeshFlattening.h +++ b/src/Mod/MeshPart/App/MeshFlattening.h @@ -55,7 +55,7 @@ std::vector> getBoundaries(ColMat vertices, ColMat< class FaceUnwrapper{ nurbs::NurbsBase2D nu; public: - FaceUnwrapper(){} + FaceUnwrapper() = default; FaceUnwrapper(const TopoDS_Face & face); FaceUnwrapper(ColMat xyz_nodes, ColMat tris); void findFlatNodes(int steps, double val); diff --git a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h index 2fc592c94e..1874a793d3 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h +++ b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h @@ -89,7 +89,7 @@ private: Eigen::MatrixXd get_nullspace(); public: - LscmRelax() {} + LscmRelax() = default; LscmRelax( RowMat vertices, RowMat triangles, diff --git a/src/Mod/MeshPart/App/MeshFlatteningNurbs.h b/src/Mod/MeshPart/App/MeshFlatteningNurbs.h index acfef85eb4..dd4929f434 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningNurbs.h +++ b/src/Mod/MeshPart/App/MeshFlatteningNurbs.h @@ -36,7 +36,7 @@ using spMat = Eigen::SparseMatrix; struct NurbsBase2D { // - NurbsBase2D(){} + NurbsBase2D() = default; NurbsBase2D(Eigen::VectorXd u_knots, Eigen::VectorXd v_knots, Eigen::VectorXd weights, int degree_u=3, int degree_v=3); @@ -81,7 +81,7 @@ struct NurbsBase2D struct NurbsBase1D { - NurbsBase1D(){} + NurbsBase1D() = default; NurbsBase1D(Eigen::VectorXd u_knots, Eigen::VectorXd weights, int degree_u=3); int degree_u; Eigen::VectorXd u_knots; diff --git a/src/Mod/MeshPart/App/Mesher.cpp b/src/Mod/MeshPart/App/Mesher.cpp index 218f5d353e..11b8407c1e 100644 --- a/src/Mod/MeshPart/App/Mesher.cpp +++ b/src/Mod/MeshPart/App/Mesher.cpp @@ -329,9 +329,7 @@ Mesher::Mesher(const TopoDS_Shape& s) { } -Mesher::~Mesher() -{ -} +Mesher::~Mesher() = default; Mesh::MeshObject* Mesher::createStandard() const { diff --git a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp index 68d3689145..160b913d96 100644 --- a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp +++ b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp @@ -52,8 +52,6 @@ public: initialize("This module is the MeshPartGui module."); // register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp index dd4d9ba520..6e4cf1015a 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.cpp +++ b/src/Mod/MeshPart/Gui/CrossSections.cpp @@ -613,11 +613,6 @@ TaskCrossSections::TaskCrossSections(const Base::BoundBox3d& bb) Content.push_back(taskbox); } -TaskCrossSections::~TaskCrossSections() -{ - // automatically deleted in the sub-class -} - bool TaskCrossSections::accept() { widget->accept(); diff --git a/src/Mod/MeshPart/Gui/CrossSections.h b/src/Mod/MeshPart/Gui/CrossSections.h index ccee279409..99eee47a2d 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.h +++ b/src/Mod/MeshPart/Gui/CrossSections.h @@ -86,7 +86,6 @@ class TaskCrossSections : public Gui::TaskView::TaskDialog public: explicit TaskCrossSections(const Base::BoundBox3d& bb); - ~TaskCrossSections() override; public: bool accept() override; diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp index 40d30e661f..0625bd73c3 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp @@ -104,11 +104,6 @@ TaskCurveOnMesh::TaskCurveOnMesh(Gui::View3DInventor* view) Content.push_back(taskbox); } -TaskCurveOnMesh::~TaskCurveOnMesh() -{ - // automatically deleted in the sub-class -} - bool TaskCurveOnMesh::reject() { widget->reject(); diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h index 0b1f7aaa5d..e97769dc7e 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h @@ -68,7 +68,6 @@ class TaskCurveOnMesh : public Gui::TaskView::TaskDialog public: explicit TaskCurveOnMesh(Gui::View3DInventor* view); - ~TaskCurveOnMesh() override; public: bool reject() override; diff --git a/src/Mod/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp index 7b6b367781..cc6c04d4d0 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.cpp +++ b/src/Mod/MeshPart/Gui/Tessellation.cpp @@ -96,9 +96,7 @@ Tessellation::Tessellation(QWidget* parent) } } -Tessellation::~Tessellation() -{ -} +Tessellation::~Tessellation() = default; void Tessellation::setupConnections() { @@ -502,9 +500,7 @@ Mesh2ShapeGmsh::Mesh2ShapeGmsh(QWidget* parent, Qt::WindowFlags fl) d->geoFile = App::Application::getTempFileName() + "mesh.geo"; } -Mesh2ShapeGmsh::~Mesh2ShapeGmsh() -{ -} +Mesh2ShapeGmsh::~Mesh2ShapeGmsh() = default; void Mesh2ShapeGmsh::process(App::Document* doc, const std::list& objs) { @@ -624,11 +620,6 @@ TaskTessellation::TaskTessellation() Content.push_back(taskbox); } -TaskTessellation::~TaskTessellation() -{ - // automatically deleted in the sub-class -} - void TaskTessellation::open() { } diff --git a/src/Mod/MeshPart/Gui/Tessellation.h b/src/Mod/MeshPart/Gui/Tessellation.h index 4d2175d42f..ccf1df7ec9 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.h +++ b/src/Mod/MeshPart/Gui/Tessellation.h @@ -120,7 +120,6 @@ class TaskTessellation : public Gui::TaskView::TaskDialog public: TaskTessellation(); - ~TaskTessellation() override; public: void open() override; diff --git a/src/Mod/MeshPart/Gui/Workbench.cpp b/src/Mod/MeshPart/Gui/Workbench.cpp index a51518a43a..b5113be32a 100644 --- a/src/Mod/MeshPart/Gui/Workbench.cpp +++ b/src/Mod/MeshPart/Gui/Workbench.cpp @@ -39,13 +39,9 @@ using namespace MeshPartGui; /// @namespace MeshPartGui @class Workbench TYPESYSTEM_SOURCE(MeshPartGui::Workbench, Gui::StdWorkbench) -Workbench::Workbench() -{ -} +Workbench::Workbench() = default; -Workbench::~Workbench() -{ -} +Workbench::~Workbench() = default; Gui::ToolBarItem* Workbench::setupToolBars() const {