From edb477a7954ebeaebf0467d1efeefb06162a6cc6 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 21 Aug 2023 13:44:55 +0200 Subject: [PATCH] Inspection: modernize C++: use equals default --- src/Mod/Inspection/App/AppInspection.cpp | 2 -- src/Mod/Inspection/App/InspectionFeature.cpp | 26 +++++-------------- src/Mod/Inspection/App/InspectionFeature.h | 8 +++--- src/Mod/Inspection/Gui/AppInspectionGui.cpp | 2 -- .../Inspection/Gui/ViewProviderInspection.cpp | 10 +++---- src/Mod/Inspection/Gui/VisualInspection.cpp | 4 +-- src/Mod/Inspection/Gui/Workbench.cpp | 8 ++---- 7 files changed, 16 insertions(+), 44 deletions(-) diff --git a/src/Mod/Inspection/App/AppInspection.cpp b/src/Mod/Inspection/App/AppInspection.cpp index aef3ea4cc5..79c0bdab45 100644 --- a/src/Mod/Inspection/App/AppInspection.cpp +++ b/src/Mod/Inspection/App/AppInspection.cpp @@ -37,8 +37,6 @@ public: initialize("This module is the Inspection module."); // register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp index 5c9cccc9b8..40bc10e293 100644 --- a/src/Mod/Inspection/App/InspectionFeature.cpp +++ b/src/Mod/Inspection/App/InspectionFeature.cpp @@ -67,9 +67,7 @@ InspectActualMesh::InspectActualMesh(const Mesh::MeshObject& rMesh) : _mesh(rMes _bApply = _clTrf != tmp; } -InspectActualMesh::~InspectActualMesh() -{ -} +InspectActualMesh::~InspectActualMesh() = default; unsigned long InspectActualMesh::countPoints() const { @@ -545,15 +543,9 @@ bool InspectNominalShape::isBelowFace(const gp_Pnt& pnt3d) const TYPESYSTEM_SOURCE(Inspection::PropertyDistanceList, App::PropertyLists) -PropertyDistanceList::PropertyDistanceList() -{ +PropertyDistanceList::PropertyDistanceList() = default; -} - -PropertyDistanceList::~PropertyDistanceList() -{ - -} +PropertyDistanceList::~PropertyDistanceList() = default; void PropertyDistanceList::setSize(int newSize) { @@ -754,9 +746,7 @@ Feature::Feature() ADD_PROPERTY(Distances,(0.0)); } -Feature::~Feature() -{ -} +Feature::~Feature() = default; short Feature::mustExecute() const { @@ -953,10 +943,6 @@ App::DocumentObjectExecReturn* Feature::execute() PROPERTY_SOURCE(Inspection::Group, App::DocumentObjectGroup) -Group::Group() -{ -} +Group::Group() = default; -Group::~Group() -{ -} +Group::~Group() = default; diff --git a/src/Mod/Inspection/App/InspectionFeature.h b/src/Mod/Inspection/App/InspectionFeature.h index 81d9315c5d..20f26c5275 100644 --- a/src/Mod/Inspection/App/InspectionFeature.h +++ b/src/Mod/Inspection/App/InspectionFeature.h @@ -50,8 +50,8 @@ namespace Inspection class InspectionExport InspectActualGeometry { public: - InspectActualGeometry() {} - virtual ~InspectActualGeometry() {} + InspectActualGeometry() = default; + virtual ~InspectActualGeometry() = default; /// Number of points to be checked virtual unsigned long countPoints() const = 0; virtual Base::Vector3f getPoint(unsigned long) const = 0; @@ -101,8 +101,8 @@ private: class InspectionExport InspectNominalGeometry { public: - InspectNominalGeometry() {} - virtual ~InspectNominalGeometry() {} + InspectNominalGeometry() = default; + virtual ~InspectNominalGeometry() = default; virtual float getDistance(const Base::Vector3f&) const = 0; }; diff --git a/src/Mod/Inspection/Gui/AppInspectionGui.cpp b/src/Mod/Inspection/Gui/AppInspectionGui.cpp index 2038d46923..d7e141c894 100644 --- a/src/Mod/Inspection/Gui/AppInspectionGui.cpp +++ b/src/Mod/Inspection/Gui/AppInspectionGui.cpp @@ -44,8 +44,6 @@ public: initialize("This module is the InspectionGui module."); // register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp index 9abc815d84..9a532edea2 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp @@ -445,7 +445,7 @@ class ViewProviderProxyObject : public QObject { public: explicit ViewProviderProxyObject(QWidget* w) : QObject(nullptr), widget(w) {} - ~ViewProviderProxyObject() override {} + ~ViewProviderProxyObject() override = default; void customEvent(QEvent *) override { if (!widget.isNull()) { @@ -682,13 +682,9 @@ PROPERTY_SOURCE(InspectionGui::ViewProviderInspectionGroup, Gui::ViewProviderDoc /** * Creates the view provider for an object group. */ -ViewProviderInspectionGroup::ViewProviderInspectionGroup() -{ -} +ViewProviderInspectionGroup::ViewProviderInspectionGroup() = default; -ViewProviderInspectionGroup::~ViewProviderInspectionGroup() -{ -} +ViewProviderInspectionGroup::~ViewProviderInspectionGroup() = default; /** * Returns the pixmap for the opened list item. diff --git a/src/Mod/Inspection/Gui/VisualInspection.cpp b/src/Mod/Inspection/Gui/VisualInspection.cpp index 26b9fd0dc4..e1c68ecd6e 100644 --- a/src/Mod/Inspection/Gui/VisualInspection.cpp +++ b/src/Mod/Inspection/Gui/VisualInspection.cpp @@ -54,9 +54,7 @@ public: { } - ~SingleSelectionItem () override - { - } + ~SingleSelectionItem () override = default; SingleSelectionItem* getCompetitiveItem() const { diff --git a/src/Mod/Inspection/Gui/Workbench.cpp b/src/Mod/Inspection/Gui/Workbench.cpp index 6fe143215c..4caffeeed7 100644 --- a/src/Mod/Inspection/Gui/Workbench.cpp +++ b/src/Mod/Inspection/Gui/Workbench.cpp @@ -33,13 +33,9 @@ using namespace InspectionGui; /// @namespace InspectionGui @class Workbench TYPESYSTEM_SOURCE(InspectionGui::Workbench, Gui::StdWorkbench) -Workbench::Workbench() -{ -} +Workbench::Workbench() = default; -Workbench::~Workbench() -{ -} +Workbench::~Workbench() = default; Gui::MenuItem* Workbench::setupMenuBar() const {