From 5686149cd3ed3cbae42e888e94b47f396bb2893f Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 22 Aug 2023 17:46:48 +0200 Subject: [PATCH] PD: modernize C++: use default member init --- src/Mod/PartDesign/App/FeatureAddSub.cpp | 1 - src/Mod/PartDesign/App/FeatureAddSub.h | 2 +- src/Mod/PartDesign/App/FeaturePrimitive.cpp | 1 - src/Mod/PartDesign/Gui/SketchWorkflow.cpp | 1 - src/Mod/PartDesign/Gui/SketchWorkflow.h | 2 +- src/Mod/PartDesign/Gui/ViewProvider.cpp | 1 - src/Mod/PartDesign/Gui/ViewProvider.h | 4 ++-- src/Mod/PartDesign/Gui/ViewProviderTransformed.h | 7 ++----- 8 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/Mod/PartDesign/App/FeatureAddSub.cpp b/src/Mod/PartDesign/App/FeatureAddSub.cpp index a3fdc79346..2d4b31fae4 100644 --- a/src/Mod/PartDesign/App/FeatureAddSub.cpp +++ b/src/Mod/PartDesign/App/FeatureAddSub.cpp @@ -43,7 +43,6 @@ namespace PartDesign { PROPERTY_SOURCE(PartDesign::FeatureAddSub, PartDesign::Feature) FeatureAddSub::FeatureAddSub() - : addSubType(Additive) { ADD_PROPERTY(AddSubShape,(TopoDS_Shape())); ADD_PROPERTY_TYPE(Refine,(0),"Part Design",(App::PropertyType)(App::Prop_None),"Refine shape (clean up redundant edges) after adding/subtracting"); diff --git a/src/Mod/PartDesign/App/FeatureAddSub.h b/src/Mod/PartDesign/App/FeatureAddSub.h index 5e04008123..d9a32cfabd 100644 --- a/src/Mod/PartDesign/App/FeatureAddSub.h +++ b/src/Mod/PartDesign/App/FeatureAddSub.h @@ -52,7 +52,7 @@ public: App::PropertyBool Refine; protected: - Type addSubType; + Type addSubType{Additive}; TopoDS_Shape refineShapeIfActive(const TopoDS_Shape&) const; }; diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.cpp b/src/Mod/PartDesign/App/FeaturePrimitive.cpp index ee8fa5cecc..331c56dbea 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.cpp +++ b/src/Mod/PartDesign/App/FeaturePrimitive.cpp @@ -61,7 +61,6 @@ const App::PropertyQuantityConstraint::Constraints quantityRangeZero = { 0.0, FL PROPERTY_SOURCE_WITH_EXTENSIONS(PartDesign::FeaturePrimitive, PartDesign::FeatureAddSub) FeaturePrimitive::FeaturePrimitive() - : primitiveType(Box) { Part::AttachExtension::initExtension(this); } diff --git a/src/Mod/PartDesign/Gui/SketchWorkflow.cpp b/src/Mod/PartDesign/Gui/SketchWorkflow.cpp index 0b2731a967..2303076404 100644 --- a/src/Mod/PartDesign/Gui/SketchWorkflow.cpp +++ b/src/Mod/PartDesign/Gui/SketchWorkflow.cpp @@ -634,7 +634,6 @@ private: SketchWorkflow::SketchWorkflow(Gui::Document* document) : guidocument(document) - , activeBody(nullptr) { appdocument = guidocument->getDocument(); } diff --git a/src/Mod/PartDesign/Gui/SketchWorkflow.h b/src/Mod/PartDesign/Gui/SketchWorkflow.h index 97ce53b6f3..f27e56c056 100644 --- a/src/Mod/PartDesign/Gui/SketchWorkflow.h +++ b/src/Mod/PartDesign/Gui/SketchWorkflow.h @@ -57,7 +57,7 @@ private: private: Gui::Document* guidocument; App::Document* appdocument; - PartDesign::Body* activeBody; + PartDesign::Body* activeBody{nullptr}; }; } // namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp index 26f6f47023..94b314d5f6 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.cpp +++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp @@ -50,7 +50,6 @@ using namespace PartDesignGui; PROPERTY_SOURCE_WITH_EXTENSIONS(PartDesignGui::ViewProvider, PartGui::ViewProviderPart) ViewProvider::ViewProvider() -: oldTip(nullptr), isSetTipIcon(false) { PartGui::ViewProviderAttachExtension::initExtension(this); } diff --git a/src/Mod/PartDesign/Gui/ViewProvider.h b/src/Mod/PartDesign/Gui/ViewProvider.h index 02004503ff..05f87bbf32 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.h +++ b/src/Mod/PartDesign/Gui/ViewProvider.h @@ -86,8 +86,8 @@ protected: virtual TaskDlgFeatureParameters *getEditDialog(); std::string oldWb; - App::DocumentObject* oldTip; - bool isSetTipIcon; + App::DocumentObject* oldTip{nullptr}; + bool isSetTipIcon{false}; }; using ViewProviderPython = Gui::ViewProviderPythonFeatureT; diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h index dd46a9a511..4927030e66 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h +++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h @@ -35,10 +35,7 @@ class PartDesignGuiExport ViewProviderTransformed : public ViewProvider PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderTransformed); public: - /// constructor - ViewProviderTransformed() - : pcRejectedRoot(nullptr) {} - /// destructor + ViewProviderTransformed() = default; ~ViewProviderTransformed() override = default; // The feature name of the subclass @@ -63,7 +60,7 @@ protected: bool checkDlgOpen(TaskDlgTransformedParameters* transformedDlg); // node for the representation of rejected repetitions - SoGroup * pcRejectedRoot; + SoGroup * pcRejectedRoot{nullptr}; QString diagMessage;