From bc8e9f5f29b808fb5bbb4a58843a7cfedd971ae5 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 22 Aug 2023 23:18:03 +0200 Subject: [PATCH] Part: modernize C++: use default member init --- src/Mod/Part/App/AttachExtension.cpp | 1 - src/Mod/Part/App/AttachExtension.h | 2 +- src/Mod/Part/App/Attacher.cpp | 6 +---- src/Mod/Part/App/Attacher.h | 8 +++---- src/Mod/Part/App/FaceMakerBullseye.h | 5 ++-- src/Mod/Part/App/FeatureExtrusion.h | 11 ++++----- .../Part/App/GeometryMigrationExtension.cpp | 5 ---- src/Mod/Part/App/GeometryMigrationExtension.h | 4 ++-- src/Mod/Part/App/edgecluster.cpp | 2 +- src/Mod/Part/App/edgecluster.h | 2 +- src/Mod/Part/Gui/BoxSelection.cpp | 7 +----- src/Mod/Part/Gui/BoxSelection.h | 4 ++-- src/Mod/Part/Gui/DlgFilletEdges.cpp | 5 ++-- src/Mod/Part/Gui/DlgPrimitives.h | 5 +--- src/Mod/Part/Gui/SoBrepEdgeSet.cpp | 1 - src/Mod/Part/Gui/SoBrepEdgeSet.h | 2 +- src/Mod/Part/Gui/SoBrepPointSet.cpp | 1 - src/Mod/Part/Gui/SoBrepPointSet.h | 2 +- src/Mod/Part/Gui/TaskOffset.cpp | 8 ++----- src/Mod/Part/Gui/TaskShapeBuilder.cpp | 4 ++-- src/Mod/Part/Gui/TaskThickness.cpp | 8 ++----- src/Mod/Part/Gui/ViewProviderCurveNet.cpp | 1 - src/Mod/Part/Gui/ViewProviderCurveNet.h | 6 ++--- src/Mod/Part/Gui/ViewProviderReference.cpp | 12 ---------- src/Mod/Part/Gui/ViewProviderReference.h | 24 +++++++++---------- src/Mod/Part/Gui/ViewProviderSpline.cpp | 1 - src/Mod/Part/Gui/ViewProviderSpline.h | 2 +- 27 files changed, 48 insertions(+), 91 deletions(-) diff --git a/src/Mod/Part/App/AttachExtension.cpp b/src/Mod/Part/App/AttachExtension.cpp index fe76dd9f97..cca0227a25 100644 --- a/src/Mod/Part/App/AttachExtension.cpp +++ b/src/Mod/Part/App/AttachExtension.cpp @@ -34,7 +34,6 @@ using namespace Attacher; EXTENSION_PROPERTY_SOURCE(Part::AttachExtension, App::DocumentObjectExtension) AttachExtension::AttachExtension() - : _attacher(nullptr) { EXTENSION_ADD_PROPERTY_TYPE(AttacherType, ("Attacher::AttachEngine3D"), "Attachment",(App::PropertyType)(App::Prop_None),"Class name of attach engine object driving the attachment."); this->AttacherType.setStatus(App::Property::Status::Hidden, true); diff --git a/src/Mod/Part/App/AttachExtension.h b/src/Mod/Part/App/AttachExtension.h index f7d3bdf90f..d33de4d64b 100644 --- a/src/Mod/Part/App/AttachExtension.h +++ b/src/Mod/Part/App/AttachExtension.h @@ -125,7 +125,7 @@ public: void updateAttacherVals(); private: - Attacher::AttachEngine* _attacher; + Attacher::AttachEngine* _attacher = nullptr; mutable int _active = -1; }; diff --git a/src/Mod/Part/App/Attacher.cpp b/src/Mod/Part/App/Attacher.cpp index d50f20c5a8..c102396cd6 100644 --- a/src/Mod/Part/App/Attacher.cpp +++ b/src/Mod/Part/App/Attacher.cpp @@ -169,11 +169,7 @@ const char* AttachEngine::eRefTypeStrings[]= { TYPESYSTEM_SOURCE_ABSTRACT(Attacher::AttachEngine, Base::BaseClass) -AttachEngine::AttachEngine() - : mapMode(mmDeactivated), mapReverse(false), attachParameter(0.0), - surfU(0.0), surfV(0.0) -{ -} +AttachEngine::AttachEngine() = default; void AttachEngine::setUp(const App::PropertyLinkSubList &references, eMapMode mapMode, bool mapReverse, diff --git a/src/Mod/Part/App/Attacher.h b/src/Mod/Part/App/Attacher.h index fcda6a677f..e580c71808 100644 --- a/src/Mod/Part/App/Attacher.h +++ b/src/Mod/Part/App/Attacher.h @@ -363,10 +363,10 @@ public: //enums public: //members App::PropertyLinkSubList references; - eMapMode mapMode; - bool mapReverse; - double attachParameter; - double surfU, surfV; + eMapMode mapMode = mmDeactivated; + bool mapReverse = false; + double attachParameter = 0.0; + double surfU = 0.0, surfV = 0.0; Base::Placement attachmentOffset; /** diff --git a/src/Mod/Part/App/FaceMakerBullseye.h b/src/Mod/Part/App/FaceMakerBullseye.h index ac84bde6e7..7bd47fbde4 100644 --- a/src/Mod/Part/App/FaceMakerBullseye.h +++ b/src/Mod/Part/App/FaceMakerBullseye.h @@ -45,8 +45,7 @@ class PartExport FaceMakerBullseye: public FaceMakerPublic { TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - FaceMakerBullseye() - :planeSupplied(false){} + FaceMakerBullseye() = default; /** * @brief setPlane: sets the plane to use when making faces. This is * optional. If the plane was set, it is not tested that the wires are @@ -63,7 +62,7 @@ protected: protected: gp_Pln myPlane; //externally supplied plane (if any) - bool planeSupplied; + bool planeSupplied{false}; /** * @brief The FaceDriller class is similar to BRepBuilderAPI_MakeFace, diff --git a/src/Mod/Part/App/FeatureExtrusion.h b/src/Mod/Part/App/FeatureExtrusion.h index 726213ff3a..0101972b60 100644 --- a/src/Mod/Part/App/FeatureExtrusion.h +++ b/src/Mod/Part/App/FeatureExtrusion.h @@ -61,13 +61,12 @@ public: */ struct ExtrusionParameters { gp_Dir dir; - double lengthFwd; - double lengthRev; - bool solid; - double taperAngleFwd; //in radians - double taperAngleRev; + double lengthFwd{0}; + double lengthRev{0}; + bool solid{false}; + double taperAngleFwd{0}; //in radians + double taperAngleRev{0}; std::string faceMakerClass; - ExtrusionParameters(): lengthFwd(0), lengthRev(0), solid(false), taperAngleFwd(0), taperAngleRev(0) {}// constructor to keep garbage out }; /** @name methods override feature */ diff --git a/src/Mod/Part/App/GeometryMigrationExtension.cpp b/src/Mod/Part/App/GeometryMigrationExtension.cpp index 48ec344025..e6f57a257f 100644 --- a/src/Mod/Part/App/GeometryMigrationExtension.cpp +++ b/src/Mod/Part/App/GeometryMigrationExtension.cpp @@ -32,11 +32,6 @@ using namespace Part; //---------- Geometry Extension TYPESYSTEM_SOURCE(Part::GeometryMigrationExtension,Part::GeometryExtension) -GeometryMigrationExtension::GeometryMigrationExtension():ConstructionState(false) -{ - -} - void GeometryMigrationExtension::copyAttributes(Part::GeometryExtension * cpy) const { Part::GeometryExtension::copyAttributes(cpy); diff --git a/src/Mod/Part/App/GeometryMigrationExtension.h b/src/Mod/Part/App/GeometryMigrationExtension.h index 9195c632a9..11f4fd0ef6 100644 --- a/src/Mod/Part/App/GeometryMigrationExtension.h +++ b/src/Mod/Part/App/GeometryMigrationExtension.h @@ -52,7 +52,7 @@ public: NumMigrationType // Must be the last }; - GeometryMigrationExtension(); + GeometryMigrationExtension() = default; ~GeometryMigrationExtension() override = default; std::unique_ptr copy() const override; @@ -75,7 +75,7 @@ private: private: using MigrationTypeFlagType = std::bitset<32>; MigrationTypeFlagType GeometryMigrationFlags; - bool ConstructionState; + bool ConstructionState{false}; }; diff --git a/src/Mod/Part/App/edgecluster.cpp b/src/Mod/Part/App/edgecluster.cpp index 0082c35843..cb1f2882b0 100644 --- a/src/Mod/Part/App/edgecluster.cpp +++ b/src/Mod/Part/App/edgecluster.cpp @@ -35,7 +35,7 @@ using namespace Part; Edgecluster::Edgecluster(const std::vector& unsorted_edges) - :m_unsortededges(unsorted_edges),m_done(false) + :m_unsortededges(unsorted_edges) { m_edges.clear(); m_vertices.clear(); diff --git a/src/Mod/Part/App/edgecluster.h b/src/Mod/Part/App/edgecluster.h index be22fe7a02..af95ebd9ae 100644 --- a/src/Mod/Part/App/edgecluster.h +++ b/src/Mod/Part/App/edgecluster.h @@ -77,7 +77,7 @@ private: tEdgeVector m_edges; tMapPntEdge m_vertices; - bool m_done; + bool m_done{false}; tEdgeVector::const_iterator m_edgeIter; diff --git a/src/Mod/Part/Gui/BoxSelection.cpp b/src/Mod/Part/Gui/BoxSelection.cpp index f25d565979..9a18d68d31 100644 --- a/src/Mod/Part/Gui/BoxSelection.cpp +++ b/src/Mod/Part/Gui/BoxSelection.cpp @@ -67,12 +67,7 @@ public: } }; -BoxSelection::BoxSelection() - : autodelete(false) - , shapeEnum(TopAbs_SHAPE) -{ - -} +BoxSelection::BoxSelection() = default; BoxSelection::~BoxSelection() = default; diff --git a/src/Mod/Part/Gui/BoxSelection.h b/src/Mod/Part/Gui/BoxSelection.h index a53dd52913..d750748a51 100644 --- a/src/Mod/Part/Gui/BoxSelection.h +++ b/src/Mod/Part/Gui/BoxSelection.h @@ -61,8 +61,8 @@ private: static void selectionCallback(void * ud, SoEventCallback * cb); private: - bool autodelete; - TopAbs_ShapeEnum shapeEnum; + bool autodelete{false}; + TopAbs_ShapeEnum shapeEnum{TopAbs_SHAPE}; }; } //namespace PartGui diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 8aae1f964e..2bd0ba12bb 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -165,11 +165,12 @@ QVariant FilletRadiusModel::data(const QModelIndex& index, int role) const namespace PartGui { class EdgeFaceSelection : public Gui::SelectionFilterGate { - bool allowEdge; + bool allowEdge{true}; App::DocumentObject*& object; public: explicit EdgeFaceSelection(App::DocumentObject*& obj) - : Gui::SelectionFilterGate(nullPointer()), allowEdge(true), object(obj) + : Gui::SelectionFilterGate(nullPointer()) + , object(obj) { } void selectEdges() diff --git a/src/Mod/Part/Gui/DlgPrimitives.h b/src/Mod/Part/Gui/DlgPrimitives.h index 7153f3d400..76d741e4fa 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.h +++ b/src/Mod/Part/Gui/DlgPrimitives.h @@ -61,9 +61,6 @@ namespace PartGui { class Picker { public: - Picker() : exitCode(-1) - { - } virtual ~Picker() = default; virtual bool pickedPoint(const SoPickedPoint * point) = 0; @@ -71,7 +68,7 @@ public: void createPrimitive(QWidget* widget, const QString&, Gui::Document*); QString toPlacement(const gp_Ax2&) const; - int exitCode; + int exitCode{-1}; QEventLoop loop; }; diff --git a/src/Mod/Part/Gui/SoBrepEdgeSet.cpp b/src/Mod/Part/Gui/SoBrepEdgeSet.cpp index 74c196186d..d2f52fcd6c 100644 --- a/src/Mod/Part/Gui/SoBrepEdgeSet.cpp +++ b/src/Mod/Part/Gui/SoBrepEdgeSet.cpp @@ -66,7 +66,6 @@ void SoBrepEdgeSet::initClass() SoBrepEdgeSet::SoBrepEdgeSet() : selContext(std::make_shared()) , selContext2(std::make_shared()) - , packedColor(0) { SO_NODE_CONSTRUCTOR(SoBrepEdgeSet); } diff --git a/src/Mod/Part/Gui/SoBrepEdgeSet.h b/src/Mod/Part/Gui/SoBrepEdgeSet.h index 43a21aa360..6335ef6cd8 100644 --- a/src/Mod/Part/Gui/SoBrepEdgeSet.h +++ b/src/Mod/Part/Gui/SoBrepEdgeSet.h @@ -72,7 +72,7 @@ private: SelContextPtr selContext; SelContextPtr selContext2; Gui::SoFCSelectionCounter selCounter; - uint32_t packedColor; + uint32_t packedColor{0}; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/SoBrepPointSet.cpp b/src/Mod/Part/Gui/SoBrepPointSet.cpp index 90db6c94f4..5cd3ea626a 100644 --- a/src/Mod/Part/Gui/SoBrepPointSet.cpp +++ b/src/Mod/Part/Gui/SoBrepPointSet.cpp @@ -60,7 +60,6 @@ void SoBrepPointSet::initClass() SoBrepPointSet::SoBrepPointSet() : selContext(std::make_shared()) , selContext2(std::make_shared()) - , packedColor(0) { SO_NODE_CONSTRUCTOR(SoBrepPointSet); } diff --git a/src/Mod/Part/Gui/SoBrepPointSet.h b/src/Mod/Part/Gui/SoBrepPointSet.h index 47852233cf..53db847f53 100644 --- a/src/Mod/Part/Gui/SoBrepPointSet.h +++ b/src/Mod/Part/Gui/SoBrepPointSet.h @@ -63,7 +63,7 @@ private: SelContextPtr selContext; SelContextPtr selContext2; Gui::SoFCSelectionCounter selCounter; - uint32_t packedColor; + uint32_t packedColor{0}; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/TaskOffset.cpp b/src/Mod/Part/Gui/TaskOffset.cpp index 2f43572237..1cadc25ee1 100644 --- a/src/Mod/Part/Gui/TaskOffset.cpp +++ b/src/Mod/Part/Gui/TaskOffset.cpp @@ -45,12 +45,8 @@ using namespace PartGui; class OffsetWidget::Private { public: - Ui_TaskOffset ui; - Part::Offset* offset; - Private() : offset(nullptr) - { - } - ~Private() = default; + Ui_TaskOffset ui{}; + Part::Offset* offset{nullptr}; }; /* TRANSLATOR PartGui::OffsetWidget */ diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp index d3efe6b88f..fb1df53db1 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp +++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp @@ -56,9 +56,9 @@ namespace PartGui { { public: enum Type {VERTEX, EDGE, FACE, ALL}; - Type mode; + Type mode{ALL}; ShapeSelection() - : Gui::SelectionFilterGate(nullPointer()), mode(ALL) + : Gui::SelectionFilterGate(nullPointer()) { } void setMode(Type mode) diff --git a/src/Mod/Part/Gui/TaskThickness.cpp b/src/Mod/Part/Gui/TaskThickness.cpp index 4e9d2106cc..45a4841226 100644 --- a/src/Mod/Part/Gui/TaskThickness.cpp +++ b/src/Mod/Part/Gui/TaskThickness.cpp @@ -48,14 +48,10 @@ using namespace PartGui; class ThicknessWidget::Private { public: - Ui_TaskOffset ui; + Ui_TaskOffset ui{}; QString text; std::string selection; - Part::Thickness* thickness; - Private() : thickness(nullptr) - { - } - ~Private() = default; + Part::Thickness* thickness{nullptr}; class FaceSelection : public Gui::SelectionFilterGate { diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp index 30687eca59..3b472b64e4 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp @@ -58,7 +58,6 @@ PROPERTY_SOURCE(PartGui::ViewProviderCurveNet,PartGui::ViewProviderPart) ViewProviderCurveNet::ViewProviderCurveNet() - : bInEdit(false),bMovePointMode(false),EdgeRoot(nullptr),VertexRoot(nullptr) { LineWidth.setValue(4.0f); PointSize.setValue(0.05f); diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.h b/src/Mod/Part/Gui/ViewProviderCurveNet.h index 09b708a509..46605917ea 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.h +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.h @@ -76,11 +76,11 @@ protected: std::list NodeList; - bool bInEdit; - bool bMovePointMode; + bool bInEdit{false}; + bool bMovePointMode{false}; Node PointToMove; /// root of the edge and vertex points - SoSeparator *EdgeRoot, *VertexRoot; + SoSeparator *EdgeRoot{nullptr}, *VertexRoot{nullptr}; Standard_Boolean computeEdges (SoSeparator* root, const TopoDS_Shape &myShape); Standard_Boolean computeVertices(SoSeparator* root, const TopoDS_Shape &myShape); diff --git a/src/Mod/Part/Gui/ViewProviderReference.cpp b/src/Mod/Part/Gui/ViewProviderReference.cpp index 76279989f9..14a45ffe4e 100644 --- a/src/Mod/Part/Gui/ViewProviderReference.cpp +++ b/src/Mod/Part/Gui/ViewProviderReference.cpp @@ -48,18 +48,6 @@ PROPERTY_SOURCE(PartGui::ViewProviderPartReference, Gui::ViewProviderGeometryObj // Construction/Destruction ViewProviderPartReference::ViewProviderPartReference() - : EdgeRoot(nullptr) - , FaceRoot(nullptr) - , VertexRoot(nullptr) - , pcLineMaterial(nullptr) - , pcPointMaterial(nullptr) - , pcLineStyle(nullptr) - , pcPointStyle(nullptr) - , pcControlPoints(nullptr) - , pShapeHints(nullptr) - , meshDeviation(0.01f) - , noPerVertexNormals(true) - , qualityNormals(false) { App::Material mat; mat.ambientColor.set(0.2f,0.2f,0.2f); diff --git a/src/Mod/Part/Gui/ViewProviderReference.h b/src/Mod/Part/Gui/ViewProviderReference.h index 1707d9b250..2408cbe818 100644 --- a/src/Mod/Part/Gui/ViewProviderReference.h +++ b/src/Mod/Part/Gui/ViewProviderReference.h @@ -86,21 +86,21 @@ protected: //bool loadParameter(); // nodes for the data representation - SoGroup *EdgeRoot; - SoGroup *FaceRoot; - SoGroup *VertexRoot; - SoMaterial *pcLineMaterial; - SoMaterial *pcPointMaterial; - SoDrawStyle *pcLineStyle; - SoDrawStyle *pcPointStyle; - SoSwitch *pcControlPoints; - SoShapeHints *pShapeHints; + SoGroup *EdgeRoot{nullptr}; + SoGroup *FaceRoot{nullptr}; + SoGroup *VertexRoot{nullptr}; + SoMaterial *pcLineMaterial{nullptr}; + SoMaterial *pcPointMaterial{nullptr}; + SoDrawStyle *pcLineStyle{nullptr}; + SoDrawStyle *pcPointStyle{nullptr}; + SoSwitch *pcControlPoints{nullptr}; + SoShapeHints *pShapeHints{nullptr}; private: // settings stuff - float meshDeviation; - bool noPerVertexNormals; - bool qualityNormals; + float meshDeviation{0.01F}; + bool noPerVertexNormals{true}; + bool qualityNormals{false}; static App::PropertyFloatConstraint::Constraints floatRange; static const char* LightingEnums[]; }; diff --git a/src/Mod/Part/Gui/ViewProviderSpline.cpp b/src/Mod/Part/Gui/ViewProviderSpline.cpp index 44554cd4ea..9c875334e6 100644 --- a/src/Mod/Part/Gui/ViewProviderSpline.cpp +++ b/src/Mod/Part/Gui/ViewProviderSpline.cpp @@ -77,7 +77,6 @@ EXTENSION_PROPERTY_SOURCE(PartGui::ViewProviderSplineExtension, Gui::ViewProvide ViewProviderSplineExtension::ViewProviderSplineExtension() - : pcControlPoints(nullptr) { initExtensionType(ViewProviderSplineExtension::getExtensionClassTypeId()); EXTENSION_ADD_PROPERTY(ControlPoints,(false)); diff --git a/src/Mod/Part/Gui/ViewProviderSpline.h b/src/Mod/Part/Gui/ViewProviderSpline.h index 760a9b0244..c958257d8b 100644 --- a/src/Mod/Part/Gui/ViewProviderSpline.h +++ b/src/Mod/Part/Gui/ViewProviderSpline.h @@ -50,7 +50,7 @@ protected: void showControlPointsOfEdge(const TopoDS_Edge&); void showControlPointsOfFace(const TopoDS_Face&); - SoSwitch *pcControlPoints; + SoSwitch *pcControlPoints{nullptr}; }; class PartGuiExport ViewProviderSpline : public ViewProviderPartExt