From fecc939611e605bf7bca903cc003a87cddd6bd78 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 22 Aug 2023 08:32:21 +0200 Subject: [PATCH] Surface: modernize C++: use equals default --- src/Mod/Surface/App/AppSurface.cpp | 2 -- src/Mod/Surface/App/FeatureExtend.cpp | 4 ---- src/Mod/Surface/App/FeatureExtend.h | 1 - src/Mod/Surface/App/FeatureSections.cpp | 4 ---- src/Mod/Surface/App/FeatureSections.h | 1 - src/Mod/Surface/Gui/AppSurfaceGui.cpp | 2 -- src/Mod/Surface/Gui/TaskFilling.cpp | 5 ----- src/Mod/Surface/Gui/TaskFilling.h | 1 - src/Mod/Surface/Gui/TaskGeomFillSurface.cpp | 5 ----- src/Mod/Surface/Gui/TaskGeomFillSurface.h | 1 - src/Mod/Surface/Gui/TaskSections.cpp | 9 +-------- src/Mod/Surface/Gui/TaskSections.h | 1 - src/Mod/Surface/Gui/Workbench.cpp | 8 ++------ 13 files changed, 3 insertions(+), 41 deletions(-) diff --git a/src/Mod/Surface/App/AppSurface.cpp b/src/Mod/Surface/App/AppSurface.cpp index cb5ab8282e..8217e88527 100644 --- a/src/Mod/Surface/App/AppSurface.cpp +++ b/src/Mod/Surface/App/AppSurface.cpp @@ -48,8 +48,6 @@ public: initialize("This module is the Surface module.");// register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/Surface/App/FeatureExtend.cpp b/src/Mod/Surface/App/FeatureExtend.cpp index d2c14d7792..7c97d0a272 100644 --- a/src/Mod/Surface/App/FeatureExtend.cpp +++ b/src/Mod/Surface/App/FeatureExtend.cpp @@ -72,10 +72,6 @@ Extend::Extend() : lockOnChangeMutex(false) SampleV.setConstraints(&SampleRange); } -Extend::~Extend() -{ -} - short Extend::mustExecute() const { if (Face.isTouched()) diff --git a/src/Mod/Surface/App/FeatureExtend.h b/src/Mod/Surface/App/FeatureExtend.h index c80d483d46..7ae7886164 100644 --- a/src/Mod/Surface/App/FeatureExtend.h +++ b/src/Mod/Surface/App/FeatureExtend.h @@ -37,7 +37,6 @@ class SurfaceExport Extend : public Part::Spline public: Extend(); - ~Extend() override; App::PropertyLinkSub Face; App::PropertyFloatConstraint Tolerance; diff --git a/src/Mod/Surface/App/FeatureSections.cpp b/src/Mod/Surface/App/FeatureSections.cpp index e38dff8ec0..b8b321b150 100644 --- a/src/Mod/Surface/App/FeatureSections.cpp +++ b/src/Mod/Surface/App/FeatureSections.cpp @@ -46,10 +46,6 @@ Sections::Sections() NSections.setScope(App::LinkScope::Global); } -Sections::~Sections() -{ -} - App::DocumentObjectExecReturn *Sections::execute() { TColGeom_SequenceOfCurve curveSeq; diff --git a/src/Mod/Surface/App/FeatureSections.h b/src/Mod/Surface/App/FeatureSections.h index f7abbc457b..e80a0a5ea0 100644 --- a/src/Mod/Surface/App/FeatureSections.h +++ b/src/Mod/Surface/App/FeatureSections.h @@ -37,7 +37,6 @@ class SurfaceExport Sections : public Part::Spline public: Sections(); - ~Sections() override; App::PropertyLinkSubList NSections; diff --git a/src/Mod/Surface/Gui/AppSurfaceGui.cpp b/src/Mod/Surface/Gui/AppSurfaceGui.cpp index f8d024109b..1c85515a73 100644 --- a/src/Mod/Surface/Gui/AppSurfaceGui.cpp +++ b/src/Mod/Surface/Gui/AppSurfaceGui.cpp @@ -50,8 +50,6 @@ public: initialize("This module is the SurfaceGui module.");// register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/Surface/Gui/TaskFilling.cpp b/src/Mod/Surface/Gui/TaskFilling.cpp index 2ec3c8825d..122f522eca 100644 --- a/src/Mod/Surface/Gui/TaskFilling.cpp +++ b/src/Mod/Surface/Gui/TaskFilling.cpp @@ -934,11 +934,6 @@ TaskFilling::TaskFilling(ViewProviderFilling* vp, Surface::Filling* obj) taskbox3->hideGroupBox(); } -TaskFilling::~TaskFilling() -{ - // automatically deleted in the sub-class -} - void TaskFilling::setEditedObject(Surface::Filling* obj) { widget1->setEditedObject(obj); diff --git a/src/Mod/Surface/Gui/TaskFilling.h b/src/Mod/Surface/Gui/TaskFilling.h index e3a986a736..94f5784ec2 100644 --- a/src/Mod/Surface/Gui/TaskFilling.h +++ b/src/Mod/Surface/Gui/TaskFilling.h @@ -127,7 +127,6 @@ class TaskFilling : public Gui::TaskView::TaskDialog public: TaskFilling(ViewProviderFilling* vp, Surface::Filling* obj); - ~TaskFilling() override; void setEditedObject(Surface::Filling* obj); public: diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp index 8636c5b6bc..711e6f2071 100644 --- a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp +++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp @@ -636,11 +636,6 @@ TaskGeomFillSurface::TaskGeomFillSurface(ViewProviderGeomFillSurface* vp, Surfac Content.push_back(taskbox); } -TaskGeomFillSurface::~TaskGeomFillSurface() -{ - // automatically deleted in the sub-class -} - void TaskGeomFillSurface::setEditedObject(Surface::GeomFillSurface* obj) { widget->setEditedObject(obj); diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.h b/src/Mod/Surface/Gui/TaskGeomFillSurface.h index c1f3ed7ab5..1a3025cdd8 100644 --- a/src/Mod/Surface/Gui/TaskGeomFillSurface.h +++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.h @@ -117,7 +117,6 @@ class TaskGeomFillSurface : public Gui::TaskView::TaskDialog public: TaskGeomFillSurface(ViewProviderGeomFillSurface* vp, Surface::GeomFillSurface* obj); - ~TaskGeomFillSurface() override; void setEditedObject(Surface::GeomFillSurface* obj); public: diff --git a/src/Mod/Surface/Gui/TaskSections.cpp b/src/Mod/Surface/Gui/TaskSections.cpp index acfe761efc..6712efa7ad 100644 --- a/src/Mod/Surface/Gui/TaskSections.cpp +++ b/src/Mod/Surface/Gui/TaskSections.cpp @@ -276,9 +276,7 @@ SectionsPanel::SectionsPanel(ViewProviderSections* vp, Surface::Sections* obj) : /* * Destroys the object and frees any allocated resources */ -SectionsPanel::~SectionsPanel() -{ -} +SectionsPanel::~SectionsPanel() = default; void SectionsPanel::setupConnections() { @@ -590,11 +588,6 @@ TaskSections::TaskSections(ViewProviderSections* vp, Surface::Sections* obj) Content.push_back(taskbox1); } -TaskSections::~TaskSections() -{ - // automatically deleted in the sub-class -} - void TaskSections::setEditedObject(Surface::Sections* obj) { widget1->setEditedObject(obj); diff --git a/src/Mod/Surface/Gui/TaskSections.h b/src/Mod/Surface/Gui/TaskSections.h index ec8c002066..368a804695 100644 --- a/src/Mod/Surface/Gui/TaskSections.h +++ b/src/Mod/Surface/Gui/TaskSections.h @@ -116,7 +116,6 @@ class TaskSections : public Gui::TaskView::TaskDialog public: TaskSections(ViewProviderSections* vp, Surface::Sections* obj); - ~TaskSections() override; void setEditedObject(Surface::Sections* obj); public: diff --git a/src/Mod/Surface/Gui/Workbench.cpp b/src/Mod/Surface/Gui/Workbench.cpp index d2241ea0bc..9229ef6d4b 100644 --- a/src/Mod/Surface/Gui/Workbench.cpp +++ b/src/Mod/Surface/Gui/Workbench.cpp @@ -34,13 +34,9 @@ using namespace SurfaceGui; /// @namespace SurfaceGui @class Workbench TYPESYSTEM_SOURCE(SurfaceGui::Workbench, Gui::StdWorkbench) -Workbench::Workbench() -{ -} +Workbench::Workbench() = default; -Workbench::~Workbench() -{ -} +Workbench::~Workbench() = default; Gui::MenuItem *Workbench::setupMenuBar() const {