From bbed2f5b5658ff3829c80855a4b71c90599730d0 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Wed, 8 Feb 2023 23:49:50 +0100 Subject: [PATCH] STYLE: Add in-class `{}` initializers to classes with override = default Added in-class `{}` default member initializers to data members of classes that have a destructor declared `override = default`. Follow-up to pull request https://github.com/InsightSoftwareConsortium/ITK/pull/3913 commit 5c97b7605e5bec4e9443b57314b50d4e090a845e "STYLE: Add in-class `{}` initializers to classes with virtual functions" --- .../itkImageRandomConstIteratorWithIndex.h | 8 ++--- ...itkImageRandomConstIteratorWithOnlyIndex.h | 8 ++--- .../itkRegularizedHeavisideStepFunction.h | 4 +-- .../include/itkFiniteDifferenceImageFilter.h | 2 +- .../include/itkGeometricalQuadEdge.h | 2 +- .../include/itkDTITubeSpatialObjectPoint.h | 4 +-- .../include/itkLineSpatialObjectPoint.h | 2 +- .../include/itkSurfaceSpatialObjectPoint.h | 2 +- .../include/itkTubeSpatialObjectPoint.h | 30 +++++++++---------- .../itkReflectiveImageRegionConstIterator.h | 6 ++-- .../include/itkFastMarchingBase.h | 28 ++++++++--------- .../itkFastMarchingStoppingCriterionBase.h | 6 ++-- .../include/itkDecimationQuadEdgeMeshFilter.h | 4 +-- ...etePrincipalCurvaturesQuadEdgeMeshFilter.h | 4 +-- ...tkLaplacianDeformationQuadEdgeMeshFilter.h | 10 +++---- Modules/IO/XML/include/itkXMLFile.h | 2 +- .../itkBinaryImageToLevelSetImageAdaptor.h | 4 +-- .../include/itkLevelSetContainerBase.h | 6 ++-- .../itkLevelSetEvolutionStoppingCriterion.h | 8 ++--- .../LevelSetsv4/include/itkLevelSetImage.h | 4 +-- 20 files changed, 72 insertions(+), 72 deletions(-) diff --git a/Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.h b/Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.h index 0a16854d17d..43b61f10a9f 100644 --- a/Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.h @@ -224,10 +224,10 @@ class ITK_TEMPLATE_EXPORT ImageRandomConstIteratorWithIndex : public ImageConstI RandomJump(); using GeneratorPointer = typename Statistics::MersenneTwisterRandomVariateGenerator::Pointer; - GeneratorPointer m_Generator; - SizeValueType m_NumberOfSamplesRequested; - SizeValueType m_NumberOfSamplesDone; - SizeValueType m_NumberOfPixelsInRegion; + GeneratorPointer m_Generator{}; + SizeValueType m_NumberOfSamplesRequested{}; + SizeValueType m_NumberOfSamplesDone{}; + SizeValueType m_NumberOfPixelsInRegion{}; }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.h b/Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.h index 4526181ee78..557fd0fd1bc 100644 --- a/Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.h +++ b/Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.h @@ -226,10 +226,10 @@ class ITK_TEMPLATE_EXPORT ImageRandomConstIteratorWithOnlyIndex : public ImageCo RandomJump(); using GeneratorPointer = typename Statistics::MersenneTwisterRandomVariateGenerator::Pointer; - GeneratorPointer m_Generator; - SizeValueType m_NumberOfSamplesRequested; - SizeValueType m_NumberOfSamplesDone; - SizeValueType m_NumberOfPixelsInRegion; + GeneratorPointer m_Generator{}; + SizeValueType m_NumberOfSamplesRequested{}; + SizeValueType m_NumberOfSamplesDone{}; + SizeValueType m_NumberOfPixelsInRegion{}; }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkRegularizedHeavisideStepFunction.h b/Modules/Core/Common/include/itkRegularizedHeavisideStepFunction.h index 488daadafd8..a5f1b0cdc2b 100644 --- a/Modules/Core/Common/include/itkRegularizedHeavisideStepFunction.h +++ b/Modules/Core/Common/include/itkRegularizedHeavisideStepFunction.h @@ -73,8 +73,8 @@ class ITK_TEMPLATE_EXPORT RegularizedHeavisideStepFunction : public HeavisideSte ~RegularizedHeavisideStepFunction() override = default; private: - RealType m_Epsilon; - RealType m_OneOverEpsilon; + RealType m_Epsilon{}; + RealType m_OneOverEpsilon{}; }; } // namespace itk diff --git a/Modules/Core/FiniteDifference/include/itkFiniteDifferenceImageFilter.h b/Modules/Core/FiniteDifference/include/itkFiniteDifferenceImageFilter.h index 291cbd7a27a..a0a95ff51ec 100644 --- a/Modules/Core/FiniteDifference/include/itkFiniteDifferenceImageFilter.h +++ b/Modules/Core/FiniteDifference/include/itkFiniteDifferenceImageFilter.h @@ -233,7 +233,7 @@ class ITK_TEMPLATE_EXPORT FiniteDifferenceImageFilter : public InPlaceImageFilte ~FiniteDifferenceImageFilter() override = default; /** State that the filter is in, i.e. UNINITIALIZED or INITIALIZED */ - bool m_IsInitialized; + bool m_IsInitialized{}; void PrintSelf(std::ostream & os, Indent indent) const override; diff --git a/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h b/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h index 20dda38326b..bfee267c729 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h +++ b/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h @@ -361,7 +361,7 @@ class ITK_TEMPLATE_EXPORT GeometricalQuadEdge : public QuadEdge OriginRefType m_Origin; // Geometrical information PrimalDataType m_Data; // User data associated to this edge. bool m_DataSet{ false }; // Indicates if the data is set. - LineCellIdentifier m_LineCellIdent; + LineCellIdentifier m_LineCellIdent{}; }; } // namespace itk diff --git a/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObjectPoint.h b/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObjectPoint.h index c70d54f36d9..a22a14e2bed 100644 --- a/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObjectPoint.h +++ b/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObjectPoint.h @@ -151,8 +151,8 @@ class ITK_TEMPLATE_EXPORT DTITubeSpatialObjectPoint : public TubeSpatialObjectPo GetField(DTITubeSpatialObjectPointFieldEnum name) const; protected: - float m_TensorMatrix[6]; - FieldListType m_Fields; + float m_TensorMatrix[6]{}; + FieldListType m_Fields{}; /** Print the object */ void diff --git a/Modules/Core/SpatialObjects/include/itkLineSpatialObjectPoint.h b/Modules/Core/SpatialObjects/include/itkLineSpatialObjectPoint.h index e5516f3f993..b1b425a67da 100644 --- a/Modules/Core/SpatialObjects/include/itkLineSpatialObjectPoint.h +++ b/Modules/Core/SpatialObjects/include/itkLineSpatialObjectPoint.h @@ -71,7 +71,7 @@ class ITK_TEMPLATE_EXPORT LineSpatialObjectPoint : public SpatialObjectPoint; @@ -260,9 +260,9 @@ class ITK_TEMPLATE_EXPORT FastMarchingBase : public FastMarchingTraits; - PriorityQueueType m_Heap; + PriorityQueueType m_Heap{}; - TopologyCheckEnum m_TopologyCheck; + TopologyCheckEnum m_TopologyCheck{}; /** \brief Get the total number of nodes in the domain */ virtual IdentifierType diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingStoppingCriterionBase.h b/Modules/Filtering/FastMarching/include/itkFastMarchingStoppingCriterionBase.h index fac9eb94a3e..44d57246fed 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingStoppingCriterionBase.h +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingStoppingCriterionBase.h @@ -86,10 +86,10 @@ class FastMarchingStoppingCriterionBase : public StoppingCriterionBase /** Destructor */ ~FastMarchingStoppingCriterionBase() override = default; - OutputDomainPointer m_Domain; + OutputDomainPointer m_Domain{}; - OutputPixelType m_PreviousValue; - OutputPixelType m_CurrentValue; + OutputPixelType m_PreviousValue{}; + OutputPixelType m_CurrentValue{}; /** Inherited classes must implement this method and make sure member variables got reinitialized. */ diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDecimationQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDecimationQuadEdgeMeshFilter.h index cdb89ec3419..83c39335b87 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDecimationQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDecimationQuadEdgeMeshFilter.h @@ -65,8 +65,8 @@ class ITK_TEMPLATE_EXPORT DecimationQuadEdgeMeshFilter : public QuadEdgeMeshToQu ~DecimationQuadEdgeMeshFilter() override = default; - CriterionPointer m_Criterion; - SizeValueType m_Iteration; + CriterionPointer m_Criterion{}; + SizeValueType m_Iteration{}; void GenerateData() override diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscretePrincipalCurvaturesQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscretePrincipalCurvaturesQuadEdgeMeshFilter.h index 6353abd5c2b..03aa021532e 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscretePrincipalCurvaturesQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscretePrincipalCurvaturesQuadEdgeMeshFilter.h @@ -77,8 +77,8 @@ class DiscretePrincipalCurvaturesQuadEdgeMeshFilter {} ~DiscretePrincipalCurvaturesQuadEdgeMeshFilter() override = default; - OutputCurvatureType m_Gaussian; - OutputCurvatureType m_Mean; + OutputCurvatureType m_Gaussian{}; + OutputCurvatureType m_Mean{}; void ComputeMeanAndGaussianCurvatures(const OutputPointType & iP) diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h index 029456a4fbc..0434497c944 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h @@ -229,12 +229,12 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilter using RowIterator = typename RowType::iterator; using RowConstIterator = typename RowType::const_iterator; - OutputMapPointIdentifier m_InternalMap; - ConstraintMapType m_Constraints; - CoefficientMapType m_CoefficientMap; - AreaMapType m_MixedAreaMap; + OutputMapPointIdentifier m_InternalMap{}; + ConstraintMapType m_Constraints{}; + CoefficientMapType m_CoefficientMap{}; + AreaMapType m_MixedAreaMap{}; - CoefficientsComputationType * m_CoefficientsMethod; + CoefficientsComputationType * m_CoefficientsMethod{}; unsigned int m_Order{ 1 }; AreaEnum m_AreaComputationType{ AreaEnum::NONE }; diff --git a/Modules/IO/XML/include/itkXMLFile.h b/Modules/IO/XML/include/itkXMLFile.h index 30e03730a23..82b3e8167ee 100644 --- a/Modules/IO/XML/include/itkXMLFile.h +++ b/Modules/IO/XML/include/itkXMLFile.h @@ -127,7 +127,7 @@ class ITK_TEMPLATE_EXPORT XMLReader : public XMLReaderBase ~XMLReader() override = default; - T * m_OutputObject; + T * m_OutputObject{}; }; /** diff --git a/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h b/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h index 896e5b24928..ad1dc43d59a 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h @@ -178,9 +178,9 @@ class ITK_TEMPLATE_EXPORT BinaryImageToSparseLevelSetImageAdaptorBase {} ~BinaryImageToSparseLevelSetImageAdaptorBase() override = default; - LevelSetLabelMapPointer m_LabelMap; + LevelSetLabelMapPointer m_LabelMap{}; - InternalImagePointer m_InternalImage; + InternalImagePointer m_InternalImage{}; }; //////////////////////////////////////////////////////////////////////////////// diff --git a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetContainerBase.h b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetContainerBase.h index 0c58022bd7a..b1f1dfebb83 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetContainerBase.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetContainerBase.h @@ -313,9 +313,9 @@ class ITK_TEMPLATE_EXPORT LevelSetContainerBase : public Object SetContainer(const LevelSetContainerType & iContainer); private: - HeavisideConstPointer m_Heaviside; - DomainMapImageFilterPointer m_DomainMapFilter; - LevelSetContainerType m_Container; + HeavisideConstPointer m_Heaviside{}; + DomainMapImageFilterPointer m_DomainMapFilter{}; + LevelSetContainerType m_Container{}; }; } // namespace itk diff --git a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEvolutionStoppingCriterion.h b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEvolutionStoppingCriterion.h index 57b59d5c5dc..53f3cfa3733 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEvolutionStoppingCriterion.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEvolutionStoppingCriterion.h @@ -81,10 +81,10 @@ class ITK_TEMPLATE_EXPORT LevelSetEvolutionStoppingCriterion : public StoppingCr /** Destructor */ ~LevelSetEvolutionStoppingCriterion() override = default; - LevelSetContainerPointer m_LevelSetContainer; - OutputRealType m_RMSChangeAccumulator; - IterationIdType m_NumberOfIterations; - IterationIdType m_CurrentIteration; + LevelSetContainerPointer m_LevelSetContainer{}; + OutputRealType m_RMSChangeAccumulator{}; + IterationIdType m_NumberOfIterations{}; + IterationIdType m_CurrentIteration{}; }; } // namespace itk #ifndef ITK_MANUAL_INSTANTIATION diff --git a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetImage.h b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetImage.h index be8990cc14e..23ea7e9b218 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetImage.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetImage.h @@ -72,8 +72,8 @@ class ITK_TEMPLATE_EXPORT LevelSetImage : public LevelSetBase