From 8b8f970b27fc3fb8b070c7702932f14a54657b9b Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 22 Aug 2023 17:40:31 +0200 Subject: [PATCH] Inspection: modernize C++: use default member init --- src/Mod/Inspection/App/InspectionFeature.cpp | 7 +++---- src/Mod/Inspection/App/InspectionFeature.h | 2 +- src/Mod/Inspection/Gui/ViewProviderInspection.cpp | 2 +- src/Mod/Inspection/Gui/ViewProviderInspection.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp index 40bc10e293..3af64c1b9a 100644 --- a/src/Mod/Inspection/App/InspectionFeature.cpp +++ b/src/Mod/Inspection/App/InspectionFeature.cpp @@ -459,7 +459,6 @@ float InspectNominalPoints::getDistance(const Base::Vector3f& point) const InspectNominalShape::InspectNominalShape(const TopoDS_Shape& shape, float /*radius*/) : _rShape(shape) - , isSolid(false) { distss = new BRepExtrema_DistShapeShape(); distss->LoadS1(_rShape); @@ -717,7 +716,7 @@ struct DistanceInspection // Helper internal class for QtConcurrent map operation. Holds sums-of-squares and counts for RMS calculation class DistanceInspectionRMS { public: - DistanceInspectionRMS() : m_numv(0), m_sumsq(0.0) {} + DistanceInspectionRMS() = default; DistanceInspectionRMS& operator += (const DistanceInspectionRMS& rhs) { this->m_numv += rhs.m_numv; @@ -730,8 +729,8 @@ public: return 0.0; return sqrt(this->m_sumsq / (double)this->m_numv); } - int m_numv; - double m_sumsq; + int m_numv{0}; + double m_sumsq{0.0}; }; } diff --git a/src/Mod/Inspection/App/InspectionFeature.h b/src/Mod/Inspection/App/InspectionFeature.h index 20f26c5275..d9c9f1bb86 100644 --- a/src/Mod/Inspection/App/InspectionFeature.h +++ b/src/Mod/Inspection/App/InspectionFeature.h @@ -163,7 +163,7 @@ private: private: BRepExtrema_DistShapeShape* distss; const TopoDS_Shape& _rShape; - bool isSolid; + bool isSolid{false}; }; class InspectionExport PropertyDistanceList: public App::PropertyLists diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp index 9a532edea2..e62b62bc6d 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp @@ -68,7 +68,7 @@ App::PropertyFloatConstraint::Constraints ViewProviderInspection::floatRange = { PROPERTY_SOURCE(InspectionGui::ViewProviderInspection, Gui::ViewProviderDocumentObject) -ViewProviderInspection::ViewProviderInspection() : search_radius(FLT_MAX) +ViewProviderInspection::ViewProviderInspection() { ADD_PROPERTY_TYPE(OutsideGrayed,(false),"",(App::PropertyType) (App::Prop_Output|App::Prop_Hidden),""); ADD_PROPERTY_TYPE(PointSize,(1.0),"Display",(App::PropertyType) (App::Prop_None/*App::Prop_Hidden*/),""); diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.h b/src/Mod/Inspection/Gui/ViewProviderInspection.h index 7e88fa0bdc..56e91f1461 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.h +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.h @@ -103,7 +103,7 @@ protected: SoCoordinate3 * pcCoords; private: - float search_radius; + float search_radius{FLT_MAX}; static bool addflag; static App::PropertyFloatConstraint::Constraints floatRange; };