diff --git a/Examples/antsCommandIterationUpdate.h b/Examples/antsCommandIterationUpdate.h index 8fbe2724c..30be88b8e 100644 --- a/Examples/antsCommandIterationUpdate.h +++ b/Examples/antsCommandIterationUpdate.h @@ -125,7 +125,7 @@ class antsCommandIterationUpdate : public itk::Command /** * Run-time type information (and related methods). */ - itkTypeMacro(antsCommandIterationUpdate, itk::Command); + itkOverrideGetNameOfClassMacro(antsCommandIterationUpdate); /** diff --git a/Examples/itkantsRegistrationHelper.h b/Examples/itkantsRegistrationHelper.h index 74bd9ccf0..25ea80da3 100644 --- a/Examples/itkantsRegistrationHelper.h +++ b/Examples/itkantsRegistrationHelper.h @@ -461,7 +461,7 @@ class RegistrationHelper final : public itk::Object itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(RegistrationHelper, Object); + itkOverrideGetNameOfClassMacro(RegistrationHelper); /** Dimension of the image. This constant is used by functions that are * templated over image type (as opposed to being templated over pixel type diff --git a/ImageRegistration/itkANTSAffine3DTransform.h b/ImageRegistration/itkANTSAffine3DTransform.h index e4e377f24..cf7b23e3e 100644 --- a/ImageRegistration/itkANTSAffine3DTransform.h +++ b/ImageRegistration/itkANTSAffine3DTransform.h @@ -30,8 +30,8 @@ class ANTSAffine3DTransform final : public MatrixOffsetTransformBase ConstPointer; /** Run-time type information (and related methods). */ - // itkTypeMacro( Rigid2DTransform, MatrixOffsetTransformBase ); - itkTypeMacro(ANTSCenteredAffine2DTransform, MatrixOffsetTransformBase); + // itkOverrideGetNameOfClassMacro( Rigid2DTransform); + itkOverrideGetNameOfClassMacro(ANTSCenteredAffine2DTransform); /** New macro for creation of through a Smart Pointer */ itkNewMacro(Self); diff --git a/ImageRegistration/itkANTSImageRegistrationOptimizer.cxx b/ImageRegistration/itkANTSImageRegistrationOptimizer.cxx index cbff3fc0c..5c6049761 100644 --- a/ImageRegistration/itkANTSImageRegistrationOptimizer.cxx +++ b/ImageRegistration/itkANTSImageRegistrationOptimizer.cxx @@ -449,7 +449,7 @@ ANTSImageRegistrationOptimizer::ComposeDiffs(DisplacementFiel DisplacementFieldPointer fieldout, TReal timesign) { - typedef Point VPointType; + typedef Point VPointType; // field->SetSpacing( fieldtowarpby->GetSpacing() ); // field->SetOrigin( fieldtowarpby->GetOrigin() ); @@ -2597,7 +2597,7 @@ ANTSImageRegistrationOptimizer::IntegratePointVelocity(TReal TReal finishtimein, IndexType velind) { - typedef Point xPointType; + typedef Point xPointType; this->m_Debug = false; diff --git a/ImageRegistration/itkANTSImageRegistrationOptimizer.h b/ImageRegistration/itkANTSImageRegistrationOptimizer.h index f0e2ee42d..816d035b0 100644 --- a/ImageRegistration/itkANTSImageRegistrationOptimizer.h +++ b/ImageRegistration/itkANTSImageRegistrationOptimizer.h @@ -66,14 +66,14 @@ class ANTSImageRegistrationOptimizer final : public Object itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(ANTSImageRegistrationOptimizer, Object); + itkOverrideGetNameOfClassMacro(ANTSImageRegistrationOptimizer); static constexpr unsigned int Dimension = TDimension; static constexpr unsigned int ImageDimension = TDimension; typedef double TComp; typedef TReal RealType; - typedef Image ImageType; + typedef Image ImageType; typedef typename ImageType::Pointer ImagePointer; typedef itk::MatrixOffsetTransformBase TransformType; @@ -106,10 +106,10 @@ class ANTSImageRegistrationOptimizer final : public Object typedef typename ParserType::OptionType OptionType; typedef GeneralToBSplineDisplacementFieldFilter BSplineFilterType; - typedef FixedArray ArrayType; + typedef FixedArray ArrayType; /** Typedefs for similarity metrics */ - typedef ANTSSimilarityMetric SimilarityMetricType; + typedef ANTSSimilarityMetric SimilarityMetricType; typedef typename SimilarityMetricType::Pointer SimilarityMetricPointer; typedef std::vector SimilarityMetricListType; diff --git a/ImageRegistration/itkANTSImageTransformation.h b/ImageRegistration/itkANTSImageTransformation.h index 75988a14b..aa7d4badb 100644 --- a/ImageRegistration/itkANTSImageTransformation.h +++ b/ImageRegistration/itkANTSImageTransformation.h @@ -46,12 +46,12 @@ class ANTSImageTransformation final : public Object typedef double TComp; /** Run-time type information (and related methods). */ - itkTypeMacro(ANTSImageTransformation, Object); + itkOverrideGetNameOfClassMacro(ANTSImageTransformation); static constexpr unsigned int Dimension = TDimension; static constexpr unsigned int ImageDimension = TDimension; typedef TReal RealType; - typedef Image ImageType; + typedef Image ImageType; /** declare transformation types */ typedef itk::MatrixOffsetTransformBase AffineTransformType; diff --git a/ImageRegistration/itkANTSLabeledPointSet.h b/ImageRegistration/itkANTSLabeledPointSet.h index 2604b7180..0373617b0 100644 --- a/ImageRegistration/itkANTSLabeledPointSet.h +++ b/ImageRegistration/itkANTSLabeledPointSet.h @@ -37,14 +37,14 @@ class ANTSLabeledPointSet : public Object itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(ANTSLabeledPointSet, Object); + itkOverrideGetNameOfClassMacro(ANTSLabeledPointSet); static constexpr unsigned int Dimension = TDimension; typedef float RealType; - typedef Image ImageType; + typedef Image ImageType; typedef typename ImageType::Pointer ImagePointer; - typedef Vector VectorType; - typedef Image DisplacementFieldType; + typedef Vector VectorType; + typedef Image DisplacementFieldType; /** Point Types for landmarks and labeled point-sets */ typedef long PointDataVectorType; diff --git a/ImageRegistration/itkANTSSimilarityMetric.h b/ImageRegistration/itkANTSSimilarityMetric.h index 018b32dae..29e7814b8 100644 --- a/ImageRegistration/itkANTSSimilarityMetric.h +++ b/ImageRegistration/itkANTSSimilarityMetric.h @@ -38,14 +38,14 @@ class ANTSSimilarityMetric final : public Object itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(ANTSSimilarityMetric, Object); + itkOverrideGetNameOfClassMacro(ANTSSimilarityMetric); static constexpr unsigned int Dimension = TDimension; typedef TReal RealType; - typedef Image ImageType; + typedef Image ImageType; typedef typename ImageType::Pointer ImagePointer; - typedef Vector VectorType; - typedef Image DisplacementFieldType; + typedef Vector VectorType; + typedef Image DisplacementFieldType; /** Point Types for landmarks and labeled point-sets */ typedef itk::ANTSLabeledPointSet LabeledPointSetType; diff --git a/ImageRegistration/itkAvantsMutualInformationRegistrationFunction.h b/ImageRegistration/itkAvantsMutualInformationRegistrationFunction.h index 678f48a71..35684b7db 100644 --- a/ImageRegistration/itkAvantsMutualInformationRegistrationFunction.h +++ b/ImageRegistration/itkAvantsMutualInformationRegistrationFunction.h @@ -132,7 +132,7 @@ class AvantsMutualInformationRegistrationFunction final itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(AvantsMutualInformationRegistrationFunction, AvantsPDEDeformableRegistrationFunction); + itkOverrideGetNameOfClassMacro(AvantsMutualInformationRegistrationFunction); /** MovingImage image type. */ typedef typename Superclass::MovingImageType MovingImageType; @@ -172,7 +172,7 @@ class AvantsMutualInformationRegistrationFunction final // DefaultInterpolatorType; /** Covariant vector type. */ - typedef CovariantVector CovariantVectorType; + typedef CovariantVector CovariantVectorType; /** Gradient calculator type. */ typedef CentralDifferenceImageFunction GradientCalculatorType; @@ -227,8 +227,8 @@ class AvantsMutualInformationRegistrationFunction final /** Types inherited from Superclass. */ typedef TranslationTransform + // Self::ImageDimension, + Self::ImageDimension> TransformType; typedef ImageToImageMetric Metricclass; @@ -738,7 +738,7 @@ modified to round. 6- The normalization is done based on NomberOfHistogramBins-1 * image derivatives from the BSpline interpolator. Otherwise, * image derivatives are computed using central differencing. */ - typedef CovariantVector ImageDerivativesType; + typedef CovariantVector ImageDerivativesType; /** Boolean to indicate if the interpolator BSpline. */ bool m_InterpolatorIsBSpline; diff --git a/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h b/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h index 841bc9736..ffec4b4bd 100644 --- a/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h +++ b/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h @@ -45,7 +45,7 @@ class AvantsPDEDeformableRegistrationFunction typedef SmartPointer ConstPointer; /** Run-time type information (and related methods) */ - itkTypeMacro(AvantsPDEDeformableRegistrationFunction, PDEDeformableRegistrationFunction); + itkOverrideGetNameOfClassMacro(AvantsPDEDeformableRegistrationFunction); /** MovingImage image type. */ typedef TMovingImage MovingImageType; diff --git a/ImageRegistration/itkCrossCorrelationRegistrationFunction.h b/ImageRegistration/itkCrossCorrelationRegistrationFunction.h index 13565bdc6..0f3eb55e2 100644 --- a/ImageRegistration/itkCrossCorrelationRegistrationFunction.h +++ b/ImageRegistration/itkCrossCorrelationRegistrationFunction.h @@ -65,7 +65,7 @@ class CrossCorrelationRegistrationFunction final itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(CrossCorrelationRegistrationFunction, AvantsPDEDeformableRegistrationFunction); + itkOverrideGetNameOfClassMacro(CrossCorrelationRegistrationFunction); /** MovingImage image type. */ typedef typename Superclass::MovingImageType MovingImageType; @@ -84,12 +84,12 @@ class CrossCorrelationRegistrationFunction final typedef typename Superclass::DisplacementFieldTypePointer DisplacementFieldTypePointer; typedef typename TDisplacementField::PixelType VectorType; - typedef CovariantVector GradientPixelType; - typedef Image GradientImageType; + typedef CovariantVector GradientPixelType; + typedef Image GradientImageType; typedef SmartPointer GradientImagePointer; typedef GradientRecursiveGaussianImageFilter GradientImageFilterType; typedef typename GradientImageFilterType::Pointer GradientImageFilterPointer; - typedef Image BinaryImageType; + typedef Image BinaryImageType; typedef typename BinaryImageType::Pointer BinaryImagePointer; /** Inherit some enums from the superclass. */ @@ -111,7 +111,7 @@ class CrossCorrelationRegistrationFunction final typedef LinearInterpolateImageFunction DefaultInterpolatorType; /** Covariant vector type. */ - typedef CovariantVector CovariantVectorType; + typedef CovariantVector CovariantVectorType; /** Gradient calculator type. */ typedef CentralDifferenceImageFunction GradientCalculatorType; diff --git a/ImageRegistration/itkExpectationBasedPointSetRegistrationFunction.h b/ImageRegistration/itkExpectationBasedPointSetRegistrationFunction.h index 9b8ca8522..575f892c8 100644 --- a/ImageRegistration/itkExpectationBasedPointSetRegistrationFunction.h +++ b/ImageRegistration/itkExpectationBasedPointSetRegistrationFunction.h @@ -71,7 +71,7 @@ class ExpectationBasedPointSetRegistrationFunction final itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(ExpectationBasedPointSetRegistrationFunction, PDEDeformableRegistrationFunction); + itkOverrideGetNameOfClassMacro(ExpectationBasedPointSetRegistrationFunction); /** MovingImage image type. */ using MovingImageType = typename Superclass::MovingImageType; diff --git a/ImageRegistration/itkJensenHavrdaCharvatTsallisLabeledPointSetMetric.h b/ImageRegistration/itkJensenHavrdaCharvatTsallisLabeledPointSetMetric.h index 2661542a4..65210da6a 100644 --- a/ImageRegistration/itkJensenHavrdaCharvatTsallisLabeledPointSetMetric.h +++ b/ImageRegistration/itkJensenHavrdaCharvatTsallisLabeledPointSetMetric.h @@ -41,9 +41,9 @@ class JensenHavrdaCharvatTsallisLabeledPointSetMetric : public PointSetToPointSe itkNewMacro(Self); /** Run-time type information (and related methods) */ - itkTypeMacro(JensenHavrdaCharvatTsallisLabeledPointSetMetric, PointSetToLabelPointSetMetric); + itkOverrideGetNameOfClassMacro(JensenHavrdaCharvatTsallisLabeledPointSetMetric); - itkStaticConstMacro(PointDimension, unsigned int, TPointSet::PointDimension); + static constexpr unsigned int PointDimension = TPointSet::PointDimension; /** Types transferred from the base class */ typedef typename Superclass::TransformType TransformType; diff --git a/ImageRegistration/itkJensenHavrdaCharvatTsallisPointSetMetric.h b/ImageRegistration/itkJensenHavrdaCharvatTsallisPointSetMetric.h index ed099ec23..da6e86236 100644 --- a/ImageRegistration/itkJensenHavrdaCharvatTsallisPointSetMetric.h +++ b/ImageRegistration/itkJensenHavrdaCharvatTsallisPointSetMetric.h @@ -40,9 +40,9 @@ class JensenHavrdaCharvatTsallisPointSetMetric : public PointSetToPointSetMetric itkNewMacro(Self); /** Run-time type information (and related methods) */ - itkTypeMacro(JensenHavrdaCharvatTsallisPointSetMetric, PointSetToPointSetMetric); + itkOverrideGetNameOfClassMacro(JensenHavrdaCharvatTsallisPointSetMetric); - itkStaticConstMacro(PointDimension, unsigned int, TPointSet::PointDimension); + static constexpr unsigned int PointDimension = TPointSet::PointDimension; /** Types transferred from the base class */ typedef typename Superclass::TransformType TransformType; diff --git a/ImageRegistration/itkJensenTsallisBSplineRegistrationFunction.h b/ImageRegistration/itkJensenTsallisBSplineRegistrationFunction.h index df81be356..f17ecb29f 100644 --- a/ImageRegistration/itkJensenTsallisBSplineRegistrationFunction.h +++ b/ImageRegistration/itkJensenTsallisBSplineRegistrationFunction.h @@ -45,13 +45,13 @@ class JensenTsallisBSplineRegistrationFunction itkNewMacro(Self); /** Run-time type information (and related methods) */ - itkTypeMacro(JensenTsallisBSplineRegistrationFunction, AvantsPDEDeformableRegistrationFunction); + itkOverrideGetNameOfClassMacro(JensenTsallisBSplineRegistrationFunction); /** * Inherit some enums from the superclass. */ - itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension); - itkStaticConstMacro(PointDimension, unsigned int, TFixedPointSet::PointDimension); + static constexpr unsigned int ImageDimension = Superclass::ImageDimension; + static constexpr unsigned int PointDimension = TFixedPointSet::PointDimension; typedef typename Superclass::NeighborhoodType NeighborhoodType; typedef typename Superclass::FloatOffsetType FloatOffsetType; @@ -87,7 +87,7 @@ class JensenTsallisBSplineRegistrationFunction * BSpline typedefs */ /** Typedefs for B-spline filter */ - typedef PointSet BSplinePointSetType; + typedef PointSet BSplinePointSetType; typedef BSplineScatteredDataPointSetToImageFilter BSplineFilterType; typedef typename BSplineFilterType::WeightsContainerType BSplineWeightsType; typedef typename BSplineFilterType::PointDataImageType ControlPointLatticeType; diff --git a/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h b/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h index 662d52c7e..02899df32 100644 --- a/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h +++ b/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h @@ -41,11 +41,11 @@ class PICSLAdvancedNormalizationToolKit final : public Object itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(PICSLAdvancedNormalizationToolKit, Object); + itkOverrideGetNameOfClassMacro(PICSLAdvancedNormalizationToolKit); static constexpr unsigned int Dimension = TDimension; typedef double TComp; typedef TReal RealType; - typedef Image ImageType; + typedef Image ImageType; typedef typename ImageType::Pointer ImagePointer; typedef typename ImageType::PixelType PixelType; @@ -63,7 +63,7 @@ class PICSLAdvancedNormalizationToolKit final : public Object typedef typename LabeledPointSetType::PointSetType PointSetType; /** Typedefs for similarity metrics */ - typedef ANTSSimilarityMetric SimilarityMetricType; + typedef ANTSSimilarityMetric SimilarityMetricType; typedef typename SimilarityMetricType::Pointer SimilarityMetricPointer; typedef std::vector SimilarityMetricListType; typedef typename SimilarityMetricType::MetricType MetricBaseType; diff --git a/ImageRegistration/itkProbabilisticRegistrationFunction.h b/ImageRegistration/itkProbabilisticRegistrationFunction.h index 3b718bfce..66b5ed766 100644 --- a/ImageRegistration/itkProbabilisticRegistrationFunction.h +++ b/ImageRegistration/itkProbabilisticRegistrationFunction.h @@ -65,7 +65,7 @@ class ProbabilisticRegistrationFunction final itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(ProbabilisticRegistrationFunction, AvantsPDEDeformableRegistrationFunction); + itkOverrideGetNameOfClassMacro(ProbabilisticRegistrationFunction); /** MovingImage image type. */ typedef typename Superclass::MovingImageType MovingImageType; @@ -84,12 +84,12 @@ class ProbabilisticRegistrationFunction final typedef typename Superclass::DisplacementFieldTypePointer DisplacementFieldTypePointer; typedef typename TDisplacementField::PixelType VectorType; - typedef CovariantVector GradientPixelType; - typedef Image GradientImageType; + typedef CovariantVector GradientPixelType; + typedef Image GradientImageType; typedef SmartPointer GradientImagePointer; typedef GradientRecursiveGaussianImageFilter GradientImageFilterType; typedef typename GradientImageFilterType::Pointer GradientImageFilterPointer; - typedef Image BinaryImageType; + typedef Image BinaryImageType; typedef typename BinaryImageType::Pointer BinaryImagePointer; /** Inherit some enums from the superclass. */ @@ -111,7 +111,7 @@ class ProbabilisticRegistrationFunction final typedef LinearInterpolateImageFunction DefaultInterpolatorType; /** Covariant vector type. */ - typedef CovariantVector CovariantVectorType; + typedef CovariantVector CovariantVectorType; /** Gradient calculator type. */ typedef CentralDifferenceImageFunction GradientCalculatorType; diff --git a/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h b/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h index cf3f95e1e..121345914 100644 --- a/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h +++ b/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h @@ -129,7 +129,7 @@ class SpatialMutualInformationRegistrationFunction final itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(SpatialMutualInformationRegistrationFunction, AvantsPDEDeformableRegistrationFunction); + itkOverrideGetNameOfClassMacro(SpatialMutualInformationRegistrationFunction); /** MovingImage image type. */ typedef typename Superclass::MovingImageType MovingImageType; @@ -169,7 +169,7 @@ class SpatialMutualInformationRegistrationFunction final // DefaultInterpolatorType; /** Covariant vector type. */ - typedef CovariantVector CovariantVectorType; + typedef CovariantVector CovariantVectorType; /** Gradient calculator type. */ typedef CentralDifferenceImageFunction GradientCalculatorType; @@ -224,8 +224,8 @@ class SpatialMutualInformationRegistrationFunction final /** Types inherited from Superclass. */ typedef TranslationTransform + // Self::ImageDimension, + Self::ImageDimension> TransformType; typedef ImageToImageMetric Metricclass; @@ -742,7 +742,7 @@ class SpatialMutualInformationRegistrationFunction final * image derivatives from the BSpline interpolator. Otherwise, * image derivatives are computed using central differencing. */ - typedef CovariantVector ImageDerivativesType; + typedef CovariantVector ImageDerivativesType; /** Boolean to indicate if the interpolator BSpline. */ bool m_InterpolatorIsBSpline; diff --git a/ImageRegistration/itkSyNDemonsRegistrationFunction.h b/ImageRegistration/itkSyNDemonsRegistrationFunction.h index 44a87f696..5b02c3c48 100644 --- a/ImageRegistration/itkSyNDemonsRegistrationFunction.h +++ b/ImageRegistration/itkSyNDemonsRegistrationFunction.h @@ -61,7 +61,7 @@ class SyNDemonsRegistrationFunction final itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(SyNDemonsRegistrationFunction, PDEDeformableRegistrationFunction); + itkOverrideGetNameOfClassMacro(SyNDemonsRegistrationFunction); /** MovingImage image type. */ typedef typename Superclass::MovingImageType MovingImageType; @@ -79,7 +79,7 @@ class SyNDemonsRegistrationFunction final typedef typename Superclass::DisplacementFieldTypePointer DisplacementFieldTypePointer; /** Inherit some enums from the superclass. */ - itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension); + static constexpr unsigned int ImageDimension = Superclass::ImageDimension; /** Inherit some enums from the superclass. */ typedef typename Superclass::PixelType PixelType; @@ -96,7 +96,7 @@ class SyNDemonsRegistrationFunction final typedef LinearInterpolateImageFunction DefaultInterpolatorType; /** Covariant vector type. */ - typedef CovariantVector CovariantVectorType; + typedef CovariantVector CovariantVectorType; /** Fixed image gradient calculator type. */ typedef CentralDifferenceImageFunction GradientCalculatorType; diff --git a/ImageRegistration/itkVectorParameterizedNeighborhoodOperatorImageFilter.h b/ImageRegistration/itkVectorParameterizedNeighborhoodOperatorImageFilter.h index b8ba82b99..30f6c91f5 100644 --- a/ImageRegistration/itkVectorParameterizedNeighborhoodOperatorImageFilter.h +++ b/ImageRegistration/itkVectorParameterizedNeighborhoodOperatorImageFilter.h @@ -65,7 +65,7 @@ class VectorParameterizedNeighborhoodOperatorImageFilter final : public ImageToI itkNewMacro(Self); /** Run-time type information (and related methods) */ - itkTypeMacro(VectorParameterizedNeighborhoodOperatorImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(VectorParameterizedNeighborhoodOperatorImageFilter); /** Extract some information from the image types. Dimensionality * of the two images is assumed to be the same. */ @@ -81,7 +81,7 @@ class VectorParameterizedNeighborhoodOperatorImageFilter final : public ImageToI typedef typename TParamImage::PixelType ParameterImageTypePixelType; /** Determine image dimension. */ - itkStaticConstMacro(ImageDimension, unsigned int, TOutputImage::ImageDimension); + static constexpr unsigned int ImageDimension = TOutputImage::ImageDimension; /** Image typedef support */ typedef TInputImage InputImageType; @@ -93,8 +93,8 @@ class VectorParameterizedNeighborhoodOperatorImageFilter final : public ImageToI /** Superclass typedefs. */ typedef typename Superclass::OutputImageRegionType OutputImageRegionType; - typedef itk::GaussianOperator OperatorType; - // Neighborhood + typedef itk::GaussianOperator OperatorType; + // Neighborhood /** Sets the operator that is used to filter the image. Note * that the operator is stored as an internal COPY (it diff --git a/ImageSegmentation/antsAtroposSegmentationImageFilter.h b/ImageSegmentation/antsAtroposSegmentationImageFilter.h index a4b3731ee..0ed9559a0 100644 --- a/ImageSegmentation/antsAtroposSegmentationImageFilter.h +++ b/ImageSegmentation/antsAtroposSegmentationImageFilter.h @@ -75,12 +75,12 @@ class AtroposSegmentationImageFilter final : public ImageToImageFilter ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(ListSampleFunction, FunctionBase); + itkOverrideGetNameOfClassMacro(ListSampleFunction); /** InputListSampleType typedef support. */ typedef TInputListSample InputListSampleType; diff --git a/ImageSegmentation/antsListSampleToListSampleFilter.h b/ImageSegmentation/antsListSampleToListSampleFilter.h index ccf7ac12c..b5ea98cbf 100644 --- a/ImageSegmentation/antsListSampleToListSampleFilter.h +++ b/ImageSegmentation/antsListSampleToListSampleFilter.h @@ -46,7 +46,7 @@ class ListSampleToListSampleFilter : public ProcessObject typedef SmartPointer ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(ListSampleToListSampleFilter, ProcessObject); + itkOverrideGetNameOfClassMacro(ListSampleToListSampleFilter); /** Some convenient typedefs. */ typedef TInputListSample InputListSampleType; diff --git a/ImageSegmentation/antsLogEuclideanGaussianListSampleFunction.h b/ImageSegmentation/antsLogEuclideanGaussianListSampleFunction.h index 0c48aa041..98984e6db 100644 --- a/ImageSegmentation/antsLogEuclideanGaussianListSampleFunction.h +++ b/ImageSegmentation/antsLogEuclideanGaussianListSampleFunction.h @@ -42,7 +42,7 @@ class LogEuclideanGaussianListSampleFunction final : public ListSampleFunction ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(WeightedVotingFusionImageFilter, NonLocalPatchBasedImageFilter); + itkOverrideGetNameOfClassMacro(WeightedVotingFusionImageFilter); itkNewMacro(Self); diff --git a/Temporary/antsFastMarchingImageFilter.h b/Temporary/antsFastMarchingImageFilter.h index 955060a4d..1ebac9cc2 100644 --- a/Temporary/antsFastMarchingImageFilter.h +++ b/Temporary/antsFastMarchingImageFilter.h @@ -111,7 +111,7 @@ class FMarchingImageFilter final : public ImageToImageFilter LevelSetType; @@ -163,11 +163,11 @@ class FMarchingImageFilter final : public ImageToImageFilter IndexType; + typedef Index IndexType; /** Enum of Fast Marching algorithm point types. FarPoints represent far * away points; TrialPoints represent points within a narrowband of the @@ -185,14 +185,14 @@ class FMarchingImageFilter final : public ImageToImageFilter LabelImageType; + typedef Image LabelImageType; typedef NeighborhoodIterator NeighborhoodIteratorType; /** LabelImagePointer typedef support. */ typedef typename LabelImageType::Pointer LabelImagePointer; /** ConnectedComponentImage typedef support. */ - typedef Image ConnectedComponentImageType; + typedef Image ConnectedComponentImageType; /** ConnectedComponentImagePointer typedef support. */ typedef typename ConnectedComponentImageType::Pointer ConnectedComponentImagePointer; diff --git a/Temporary/itkAddConstantToImageFilter.h b/Temporary/itkAddConstantToImageFilter.h index 2e92fd6e8..9d082b281 100644 --- a/Temporary/itkAddConstantToImageFilter.h +++ b/Temporary/itkAddConstantToImageFilter.h @@ -103,7 +103,7 @@ class AddConstantToImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(AddConstantToImageFilter, UnaryFunctorImageFilter); + itkOverrideGetNameOfClassMacro(AddConstantToImageFilter); /** Set the constant that will be used to multiply all the image * pixels */ diff --git a/Temporary/itkDijkstrasAlgorithm.h b/Temporary/itkDijkstrasAlgorithm.h index 7f294cefa..5359dab52 100644 --- a/Temporary/itkDijkstrasAlgorithm.h +++ b/Temporary/itkDijkstrasAlgorithm.h @@ -77,7 +77,7 @@ typename GraphSearchNode : public itk::LightObject typedef LightObject Superclass; typedef SmartPointer Pointer; typedef SmartPointer ConstPointer; - itkTypeMacro(GraphSearchNode, LightObject); + itkOverrideGetNameOfClassMacro(GraphSearchNode); itkNewMacro(Self); /** Method for creation through the object factory. */ enum StateType @@ -315,7 +315,7 @@ typedef DijkstrasAlgorithmQueue Self; typedef LightObject Superclass; typedef SmartPointer Pointer; typedef SmartPointer ConstPointer; -itkTypeMacro(DijkstrasAlgorithmQueue, LightObject); +itkOverrideGetNameOfClassMacro(DijkstrasAlgorithmQueue); itkNewMacro(Self); /** Method for creation through the object factory. */ typedef typename TGraphSearchNode::Pointer TGraphSearchNodePointer; @@ -440,7 +440,7 @@ class DijkstrasAlgorithm : public itk::LightObject typedef LightObject Superclass; typedef SmartPointer Pointer; typedef SmartPointer ConstPointer; - itkTypeMacro(DijkstrasAlgorithm, LightObject); + itkOverrideGetNameOfClassMacro(DijkstrasAlgorithm); itkNewMacro(Self); // Computation Data diff --git a/Temporary/itkFEMConformalMap.h b/Temporary/itkFEMConformalMap.h index 572816908..4714d2059 100644 --- a/Temporary/itkFEMConformalMap.h +++ b/Temporary/itkFEMConformalMap.h @@ -83,7 +83,7 @@ class FEMConformalMap : public ProcessObject typedef SmartPointer ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(FEMConformalMap, ProcessObject); + itkOverrideGetNameOfClassMacro(FEMConformalMap); /** Method for creation through the object factory. */ itkNewMacro(Self); @@ -106,7 +106,7 @@ class FEMConformalMap : public ProcessObject typedef double RealType; typedef vnl_vector VectorType; - typedef vnl_vector_fixed FixedVectorType; + typedef vnl_vector_fixed FixedVectorType; typedef vnl_matrix MatrixType; /** FEM types */ diff --git a/Temporary/itkFEMDiscConformalMap.h b/Temporary/itkFEMDiscConformalMap.h index 8b7ee2bdb..9cf60c1af 100644 --- a/Temporary/itkFEMDiscConformalMap.h +++ b/Temporary/itkFEMDiscConformalMap.h @@ -87,7 +87,7 @@ class FEMDiscConformalMap : public ProcessObject typedef SmartPointer ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(FEMDiscConformalMap, ProcessObject); + itkOverrideGetNameOfClassMacro(FEMDiscConformalMap); /** Method for creation through the object factory. */ itkNewMacro(Self); @@ -111,7 +111,7 @@ class FEMDiscConformalMap : public ProcessObject typedef float RealType; typedef vnl_vector VectorType; - typedef vnl_vector_fixed FixedVectorType; + typedef vnl_vector_fixed FixedVectorType; typedef vnl_matrix MatrixType; typedef Image FlatImageType; diff --git a/Temporary/itkManifoldIntegrationAlgorithm.h b/Temporary/itkManifoldIntegrationAlgorithm.h index e1f69e979..50cb26ac8 100644 --- a/Temporary/itkManifoldIntegrationAlgorithm.h +++ b/Temporary/itkManifoldIntegrationAlgorithm.h @@ -51,7 +51,7 @@ class ManifoldIntegrationAlgorithm : public itk::LightObject typedef LightObject Superclass; typedef SmartPointer Pointer; typedef SmartPointer ConstPointer; - itkTypeMacro(ManifoldIntegrationAlgorithm, LightObject); + itkOverrideGetNameOfClassMacro(ManifoldIntegrationAlgorithm); itkNewMacro(Self); // Computation Data diff --git a/Temporary/itkMeanSquaresPointSetToPointSetIntensityMetricv4.h b/Temporary/itkMeanSquaresPointSetToPointSetIntensityMetricv4.h index 4023c2c47..e0f78bb16 100644 --- a/Temporary/itkMeanSquaresPointSetToPointSetIntensityMetricv4.h +++ b/Temporary/itkMeanSquaresPointSetToPointSetIntensityMetricv4.h @@ -59,7 +59,7 @@ class MeanSquaresPointSetToPointSetIntensityMetricv4 final itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(MeanSquaresPointSetToPointSetIntensityMetricv4, PointSetToPointSetMetricv4); + itkOverrideGetNameOfClassMacro(MeanSquaresPointSetToPointSetIntensityMetricv4); /** Type of the fixed point set. */ typedef TFixedPointSet FixedPointSetType; diff --git a/Temporary/itkMultiplyByConstantImageFilter.h b/Temporary/itkMultiplyByConstantImageFilter.h index f19aa2e4b..7be7f89a2 100644 --- a/Temporary/itkMultiplyByConstantImageFilter.h +++ b/Temporary/itkMultiplyByConstantImageFilter.h @@ -49,7 +49,7 @@ class MultiplyByConstantImageFilter /** method for creation through object factory */ itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(MultiplyByConstantImageFilter, MultiplyImageFilter); + itkOverrideGetNameOfClassMacro(MultiplyByConstantImageFilter); protected: MultiplyByConstantImageFilter() = default; diff --git a/Tensor/itkExpTensorImageFilter.h b/Tensor/itkExpTensorImageFilter.h index a133bfc00..d19fc0274 100644 --- a/Tensor/itkExpTensorImageFilter.h +++ b/Tensor/itkExpTensorImageFilter.h @@ -41,8 +41,8 @@ class ExpTensorImageFilter : public ImageToImageFilter VectorType; typedef VariableSizeMatrix VariableMatrixType; - itkStaticConstMacro(ImageDimension, unsigned int, TTensorImage::ImageDimension); + static constexpr unsigned int ImageDimension = TTensorImage::ImageDimension; typedef itk::Image RealTypeImageType; @@ -113,7 +113,7 @@ class PreservationOfPrincipalDirectionTensorReorientationImageFilter final itkGetMacro(UseImageDirection, bool); /** Run-time type information (and related methods). */ - itkTypeMacro(PreservationOfPrincipalDirectionTensorReorientationImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(PreservationOfPrincipalDirectionTensorReorientationImageFilter); /** Image typedef support. */ typedef typename InputImageType::ConstPointer InputImagePointer; diff --git a/Tensor/itkWarpTensorImageMultiTransformFilter.h b/Tensor/itkWarpTensorImageMultiTransformFilter.h index e48b4c2ff..94ec0c2f1 100644 --- a/Tensor/itkWarpTensorImageMultiTransformFilter.h +++ b/Tensor/itkWarpTensorImageMultiTransformFilter.h @@ -99,7 +99,7 @@ class WarpTensorImageMultiTransformFilter : public ImageToImageFilter PointType; + typedef Point PointType; typedef struct _DeformationTypeEx { diff --git a/Utilities/ReadWriteData.h b/Utilities/ReadWriteData.h index e7224aae7..94745c51e 100644 --- a/Utilities/ReadWriteData.h +++ b/Utilities/ReadWriteData.h @@ -669,8 +669,8 @@ ReadWarpFromFile(std::string warpfn, std::string ext) typedef itk::Image RealImageType; typedef RealImageType ImageType; - // typedef itk::Vector VectorType; - // typedef itk::Image FieldType; + // typedef itk::Vector VectorType; + // typedef itk::Image FieldType; // std::cout << " warp file name " << warpfn + ext << std::endl; // First - read the vector fields diff --git a/Utilities/antsCommandLineOption.h b/Utilities/antsCommandLineOption.h index 2308e84b9..45d8017e9 100644 --- a/Utilities/antsCommandLineOption.h +++ b/Utilities/antsCommandLineOption.h @@ -59,7 +59,7 @@ class OptionFunction final : public DataObject itkNewMacro(Self); - itkTypeMacro(OptionFunction, DataObject); + itkOverrideGetNameOfClassMacro(OptionFunction); typedef std::deque ParameterStackType; @@ -122,7 +122,7 @@ class CommandLineOption final : public DataObject itkNewMacro(Self); - itkTypeMacro(CommandLineOption, DataObject); + itkOverrideGetNameOfClassMacro(CommandLineOption); typedef OptionFunction OptionFunctionType; diff --git a/Utilities/antsCommandLineParser.h b/Utilities/antsCommandLineParser.h index 584f23112..c0336ffe5 100644 --- a/Utilities/antsCommandLineParser.h +++ b/Utilities/antsCommandLineParser.h @@ -62,7 +62,7 @@ class CommandLineParser final : public DataObject itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(CommandLineParser, DataObject); + itkOverrideGetNameOfClassMacro(CommandLineParser); typedef CommandLineOption OptionType; typedef std::list OptionListType; diff --git a/Utilities/antsMatrixUtilities.h b/Utilities/antsMatrixUtilities.h index fde0291d7..2dba94a13 100644 --- a/Utilities/antsMatrixUtilities.h +++ b/Utilities/antsMatrixUtilities.h @@ -35,10 +35,10 @@ class antsMatrixUtilities final : public ImageToImageFilter RealImageType; + typedef Image RealImageType; /** note, eigen for pseudo-eigenvals */ typedef vnl_matrix MatrixType; diff --git a/Utilities/antsSCCANObject.h b/Utilities/antsSCCANObject.h index eeb21fa52..8127b5779 100644 --- a/Utilities/antsSCCANObject.h +++ b/Utilities/antsSCCANObject.h @@ -45,10 +45,10 @@ class antsSCCANObject final : public ImageToImageFilter RealImageType; - typedef Image RealImageTypeDminus1; + typedef Image RealImageType; + typedef Image RealImageTypeDminus1; /** Define eigen types */ // typedef Eigen::Matrix eMatrix; diff --git a/Utilities/itkAlternatingValueDifferenceImageFilter.h b/Utilities/itkAlternatingValueDifferenceImageFilter.h index b5aab80fe..c8f5c48bd 100644 --- a/Utilities/itkAlternatingValueDifferenceImageFilter.h +++ b/Utilities/itkAlternatingValueDifferenceImageFilter.h @@ -54,7 +54,7 @@ class AlternatingValueDifferenceImageFilter final : public ImageToImageFilter + typedef ImageToImageFilterDetail::ExtractImageFilterRegionCopier ExtractImageFilterRegionCopierType; /** Set/Get the output image region. diff --git a/Utilities/itkComposeDiffeomorphismsImageFilter.h b/Utilities/itkComposeDiffeomorphismsImageFilter.h index a288098b1..306e717e6 100644 --- a/Utilities/itkComposeDiffeomorphismsImageFilter.h +++ b/Utilities/itkComposeDiffeomorphismsImageFilter.h @@ -46,7 +46,7 @@ class ComposeDiffeomorphismsImageFilter : public ImageToImageFilter RealImageType; - typedef PointSet PointSetType; + typedef PointSet PointSetType; typedef BSplineScatteredDataPointSetToImageFilter BSplineFilterType; typedef typename BSplineFilterType::ArrayType ArrayType; diff --git a/Utilities/itkGeometricJacobianDeterminantImageFilter.h b/Utilities/itkGeometricJacobianDeterminantImageFilter.h index 60972f727..5fb87f861 100644 --- a/Utilities/itkGeometricJacobianDeterminantImageFilter.h +++ b/Utilities/itkGeometricJacobianDeterminantImageFilter.h @@ -39,7 +39,7 @@ class ITK_EXPORT GeometricJacobianDeterminantImageFilter : public ImageToImageFi itkNewMacro(Self); /** Run-time type information (and related methods) */ - itkTypeMacro(GeometricJacobianDeterminantImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(GeometricJacobianDeterminantImageFilter); /** Extract some information from the image types. Dimensionality * of the two images is assumed to be the same. */ @@ -53,7 +53,7 @@ class ITK_EXPORT GeometricJacobianDeterminantImageFilter : public ImageToImageFi typedef typename OutputImageType::Pointer OutputImagePointer; /** The dimensionality of the input and output images. */ - itkStaticConstMacro(ImageDimension, unsigned int, TOutputImage::ImageDimension); + static constexpr unsigned int ImageDimension = TOutputImage::ImageDimension; /** Define the data type and the vector of data type used in calculations. */ typedef TRealType RealType; diff --git a/Utilities/itkImageIntensityAndGradientToPointSetFilter.h b/Utilities/itkImageIntensityAndGradientToPointSetFilter.h index 3b00d66e3..486a7a5a2 100644 --- a/Utilities/itkImageIntensityAndGradientToPointSetFilter.h +++ b/Utilities/itkImageIntensityAndGradientToPointSetFilter.h @@ -41,10 +41,10 @@ class ImageIntensityAndGradientToPointSetFilter final : public MeshSource itkNewMacro(Self); /** Extract dimension from the output mesh. */ - itkStaticConstMacro(Dimension, unsigned int, TOutputMesh::PointType::Dimension); + static constexpr unsigned int Dimension = TOutputMesh::PointType::Dimension; /** Run-time type information (and related methods). */ - itkTypeMacro(LabeledPointSetFileReader, MeshSource); + itkOverrideGetNameOfClassMacro(LabeledPointSetFileReader); /** Hold on to the type information specified by the template parameters. */ typedef TOutputMesh OutputMeshType; @@ -60,7 +60,7 @@ class LabeledPointSetFileReader final : public MeshSource typedef VectorContainer MultiComponentScalarSetType; typedef VectorContainer LineSetType; - typedef Image LabeledPointSetImageType; + typedef Image LabeledPointSetImageType; typedef std::vector LabelSetType; diff --git a/Utilities/itkLabeledPointSetFileWriter.h b/Utilities/itkLabeledPointSetFileWriter.h index 9fd8cefd2..a24349bfa 100644 --- a/Utilities/itkLabeledPointSetFileWriter.h +++ b/Utilities/itkLabeledPointSetFileWriter.h @@ -49,10 +49,10 @@ class LabeledPointSetFileWriter final : public Object Write(); /** Extract dimension from the output mesh. */ - itkStaticConstMacro(Dimension, unsigned int, TInputMesh::PointType::Dimension); + static constexpr unsigned int Dimension = TInputMesh::PointType::Dimension; /** Run-time type information (and related methods). */ - itkTypeMacro(LabeledPointSetFileWriter, Object); + itkOverrideGetNameOfClassMacro(LabeledPointSetFileWriter); /** Hold on to the type information specified by the template parameters. */ typedef TInputMesh InputMeshType; @@ -65,7 +65,7 @@ class LabeledPointSetFileWriter final : public Object typedef Array LineType; typedef VectorContainer MultiComponentScalarSetType; typedef VectorContainer LineSetType; - typedef Image LabeledPointSetImageType; + typedef Image LabeledPointSetImageType; typedef typename LabeledPointSetImageType::SizeType ImageSizeType; typedef typename LabeledPointSetImageType::PointType ImageOriginType; typedef typename LabeledPointSetImageType::SpacingType ImageSpacingType; diff --git a/Utilities/itkManifoldParzenWindowsPointSetFunction.h b/Utilities/itkManifoldParzenWindowsPointSetFunction.h index 71af575ba..57c84dd48 100644 --- a/Utilities/itkManifoldParzenWindowsPointSetFunction.h +++ b/Utilities/itkManifoldParzenWindowsPointSetFunction.h @@ -47,7 +47,7 @@ class ManifoldParzenWindowsPointSetFunction : public PointSetFunction MeasurementVectorType; + typedef Vector MeasurementVectorType; typedef typename Statistics::ListSample SampleType; typedef typename Statistics ::WeightedCentroidKdTreeGenerator TreeGeneratorType; typedef typename TreeGeneratorType::KdTreeType KdTreeType; diff --git a/Utilities/itkMultiScaleLaplacianBlobDetectorImageFilter.h b/Utilities/itkMultiScaleLaplacianBlobDetectorImageFilter.h index 651433b2b..e577a97bd 100644 --- a/Utilities/itkMultiScaleLaplacianBlobDetectorImageFilter.h +++ b/Utilities/itkMultiScaleLaplacianBlobDetectorImageFilter.h @@ -53,10 +53,10 @@ class ScaleSpaceBlobSpatialObject final : public GaussianSpatialObject RealImageType; typedef typename RealImageType::IndexType CenterType; - itkStaticConstMacro(NumberOfDimensions, unsigned int, TDimension); + static constexpr unsigned int NumberOfDimensions = TDimension; itkNewMacro(Self); - itkTypeMacro(ScaleSpaceBlobSpatialObject, GaussianSpatialObject); + itkOverrideGetNameOfClassMacro(ScaleSpaceBlobSpatialObject); /** Set/Get the normalized laplacian value of the extrema */ itkGetMacro(ScaleSpaceValue, double); @@ -129,7 +129,7 @@ class MultiScaleLaplacianBlobDetectorImageFilter final : public ImageToImageFilt itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(MultiScaleLaplacianBlobDetectorImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(MultiScaleLaplacianBlobDetectorImageFilter); /** Typedef to images */ typedef TInputImage InputImageType; diff --git a/Utilities/itkMultiplyByConstantVectorImageFilter.h b/Utilities/itkMultiplyByConstantVectorImageFilter.h index 16e68af1f..49d11d20d 100644 --- a/Utilities/itkMultiplyByConstantVectorImageFilter.h +++ b/Utilities/itkMultiplyByConstantVectorImageFilter.h @@ -110,7 +110,7 @@ class MultiplyByConstantVectorImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(MultiplyByConstantVectorImageFilter, UnaryFunctorImageFilter); + itkOverrideGetNameOfClassMacro(MultiplyByConstantVectorImageFilter); /** Set the constant that will be used to multiply all the image pixels */ void diff --git a/Utilities/itkN3BiasFieldCorrectionImageFilter.h b/Utilities/itkN3BiasFieldCorrectionImageFilter.h index 0d52bfd6d..47260b86c 100644 --- a/Utilities/itkN3BiasFieldCorrectionImageFilter.h +++ b/Utilities/itkN3BiasFieldCorrectionImageFilter.h @@ -91,7 +91,7 @@ class N3BiasFieldCorrectionImageFilter : public ImageToImageFilter; /** Runtime information support. */ - itkTypeMacro(N3BiasFieldCorrectionImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(N3BiasFieldCorrectionImageFilter); /** Standard New method. */ itkNewMacro(Self); diff --git a/Utilities/itkN3MRIBiasFieldCorrectionImageFilter.h b/Utilities/itkN3MRIBiasFieldCorrectionImageFilter.h index 11433245d..59ad6c5ec 100644 --- a/Utilities/itkN3MRIBiasFieldCorrectionImageFilter.h +++ b/Utilities/itkN3MRIBiasFieldCorrectionImageFilter.h @@ -93,7 +93,7 @@ class N3BiasFieldScaleCostFunction final : public SingleValuedCostFunction typedef SmartPointer ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(N3BiasFieldScaleCostFunction, SingleValuedCostFunction); + itkOverrideGetNameOfClassMacro(N3BiasFieldScaleCostFunction); /** Method for creation through the object factory. */ itkNewMacro(Self); @@ -147,13 +147,13 @@ class N3MRIBiasFieldCorrectionImageFilter final : public ImageToImageFilter ConstPointer; /** Runtime information support. */ - itkTypeMacro(N3MRIBiasFieldCorrectionImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(N3MRIBiasFieldCorrectionImageFilter); /** Standard New method. */ itkNewMacro(Self); /** ImageDimension constants */ - itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension); + static constexpr unsigned int ImageDimension = TInputImage::ImageDimension; /** Some convenient typedefs. */ typedef TInputImage InputImageType; @@ -166,8 +166,8 @@ class N3MRIBiasFieldCorrectionImageFilter final : public ImageToImageFilter ScalarType; - typedef PointSet PointSetType; - typedef Image ScalarImageType; + typedef PointSet PointSetType; + typedef Image ScalarImageType; typedef BSplineScatteredDataPointSetToImageFilter BSplineFilterType; typedef typename BSplineFilterType::PointDataImageType BiasFieldControlPointLatticeType; typedef typename BSplineFilterType::ArrayType ArrayType; diff --git a/Utilities/itkNeighborhoodFirstOrderStatisticsImageFilter.h b/Utilities/itkNeighborhoodFirstOrderStatisticsImageFilter.h index d9c7972a4..45416406b 100644 --- a/Utilities/itkNeighborhoodFirstOrderStatisticsImageFilter.h +++ b/Utilities/itkNeighborhoodFirstOrderStatisticsImageFilter.h @@ -54,7 +54,7 @@ class ITK_EXPORT NeighborhoodFirstOrderStatisticsImageFilter itkNewMacro(Self); /** Runtime information support. */ - itkTypeMacro(NeighborhoodFirstOrderStatisticsImageFilter, MovingHistogramImageFilter); + itkOverrideGetNameOfClassMacro(NeighborhoodFirstOrderStatisticsImageFilter); /** Image related typedefs. */ typedef TInputImage InputImageType; diff --git a/Utilities/itkNonLocalSuperresolutionImageFilter.h b/Utilities/itkNonLocalSuperresolutionImageFilter.h index d697af7e2..beb983c82 100644 --- a/Utilities/itkNonLocalSuperresolutionImageFilter.h +++ b/Utilities/itkNonLocalSuperresolutionImageFilter.h @@ -58,13 +58,13 @@ class NonLocalSuperresolutionImageFilter final : public NonLocalPatchBasedImageF typedef SmartPointer ConstPointer; /** Runtime information support. */ - itkTypeMacro(NonLocalSuperresolutionImageFilter, NonLocalPatchBasedImageFilter); + itkOverrideGetNameOfClassMacro(NonLocalSuperresolutionImageFilter); /** Standard New method. */ itkNewMacro(Self); /** ImageDimension constants */ - itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension); + static constexpr unsigned int ImageDimension = TInputImage::ImageDimension; /** Some convenient typedefs. */ typedef TInputImage InputImageType; diff --git a/Utilities/itkOptimalSharpeningImageFilter.h b/Utilities/itkOptimalSharpeningImageFilter.h index b4e1a11c4..d436e0655 100644 --- a/Utilities/itkOptimalSharpeningImageFilter.h +++ b/Utilities/itkOptimalSharpeningImageFilter.h @@ -56,7 +56,7 @@ class OptimalSharpeningImageFilter : public ImageToImageFilter::RealType RealType; typedef typename TInputImage::PixelType InputPixelType; typedef typename TInputImage::InternalPixelType InputInternalPixelType; - itkStaticConstMacro(ImageDimension, unsigned int, TOutputImage::ImageDimension); + static constexpr unsigned int ImageDimension = TOutputImage::ImageDimension; /** Image typedef support. */ typedef TInputImage InputImageType; @@ -68,7 +68,7 @@ class OptimalSharpeningImageFilter : public ImageToImageFilter ConstPointer; /** Run-time type information (and related methods) */ - itkTypeMacro(OptimalSharpeningImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(OptimalSharpeningImageFilter); /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/Utilities/itkPointSetFunction.h b/Utilities/itkPointSetFunction.h index 12fe8afed..e19bf5837 100644 --- a/Utilities/itkPointSetFunction.h +++ b/Utilities/itkPointSetFunction.h @@ -52,7 +52,7 @@ class PointSetFunction : public FunctionBase ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(PointSetFunction, FunctionBase); + itkOverrideGetNameOfClassMacro(PointSetFunction); /** InputPointSetType typedef support. */ typedef TInputPointSet InputPointSetType; diff --git a/Utilities/itkPseudoContinuousArterialSpinLabeledCerebralBloodFlowImageFilter.h b/Utilities/itkPseudoContinuousArterialSpinLabeledCerebralBloodFlowImageFilter.h index b8f2f3130..1edaf7c7d 100644 --- a/Utilities/itkPseudoContinuousArterialSpinLabeledCerebralBloodFlowImageFilter.h +++ b/Utilities/itkPseudoContinuousArterialSpinLabeledCerebralBloodFlowImageFilter.h @@ -61,7 +61,7 @@ class PseudoContinuousArterialSpinLabeledCerebralBloodFlowImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(PseudoContinuousArterialSpinLabeledCerebralBloodFlowImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(PseudoContinuousArterialSpinLabeledCerebralBloodFlowImageFilter); /** Compiler can't inherit typedef? */ typedef TInputImage InputImageType; @@ -75,9 +75,9 @@ class PseudoContinuousArterialSpinLabeledCerebralBloodFlowImageFilter typedef typename ReferenceImageType::RegionType ReferenceImageRegionType; /** Compiler can't inherit ImageDimension enumeration? */ - itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); - itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension); - itkStaticConstMacro(ReferenceImageDimension, unsigned int, TReferenceImage::ImageDimension); + static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension; + static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; + static constexpr unsigned int ReferenceImageDimension = TReferenceImage::ImageDimension; itkGetMacro(TI1, float); itkSetMacro(TI1, float); diff --git a/Utilities/itkPulsedArterialSpinLabeledCerebralBloodFlowImageFilter.h b/Utilities/itkPulsedArterialSpinLabeledCerebralBloodFlowImageFilter.h index a77b728bb..f6d60a5f9 100644 --- a/Utilities/itkPulsedArterialSpinLabeledCerebralBloodFlowImageFilter.h +++ b/Utilities/itkPulsedArterialSpinLabeledCerebralBloodFlowImageFilter.h @@ -60,7 +60,7 @@ class PulsedArterialSpinLabeledCerebralBloodFlowImageFilter final : public Image itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(PulsedArterialSpinLabeledCerebralBloodFlowImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(PulsedArterialSpinLabeledCerebralBloodFlowImageFilter); /** Compiler can't inherit typedef? */ typedef TInputImage InputImageType; @@ -74,9 +74,9 @@ class PulsedArterialSpinLabeledCerebralBloodFlowImageFilter final : public Image typedef typename ReferenceImageType::RegionType ReferenceImageRegionType; /** Compiler can't inherit ImageDimension enumeration? */ - itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); - itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension); - itkStaticConstMacro(ReferenceImageDimension, unsigned int, TReferenceImage::ImageDimension); + static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension; + static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; + static constexpr unsigned int ReferenceImageDimension = TReferenceImage::ImageDimension; itkGetMacro(TI1, float); itkSetMacro(TI1, float); diff --git a/Utilities/itkSimulatedBSplineDisplacementFieldSource.h b/Utilities/itkSimulatedBSplineDisplacementFieldSource.h index 32543c98d..f598fd066 100644 --- a/Utilities/itkSimulatedBSplineDisplacementFieldSource.h +++ b/Utilities/itkSimulatedBSplineDisplacementFieldSource.h @@ -54,7 +54,7 @@ class SimulatedBSplineDisplacementFieldSource final : public SimulatedDisplaceme itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(SimulatedBSplineDisplacementFieldSource, SimulatedDisplacementFieldSource); + itkOverrideGetNameOfClassMacro(SimulatedBSplineDisplacementFieldSource); /** Number of dimensions */ static constexpr unsigned int ImageDimension = TOutputImage::ImageDimension; diff --git a/Utilities/itkSimulatedDisplacementFieldSource.h b/Utilities/itkSimulatedDisplacementFieldSource.h index 53f4812c0..dd328249c 100644 --- a/Utilities/itkSimulatedDisplacementFieldSource.h +++ b/Utilities/itkSimulatedDisplacementFieldSource.h @@ -54,7 +54,7 @@ class SimulatedDisplacementFieldSource : public ImageSource itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(SimulatedDisplacementFieldSource, ImageSource); + itkOverrideGetNameOfClassMacro(SimulatedDisplacementFieldSource); /** Number of dimensions. */ static constexpr unsigned int ImageDimension = TOutputImage::ImageDimension; diff --git a/Utilities/itkSimulatedExponentialDisplacementFieldSource.h b/Utilities/itkSimulatedExponentialDisplacementFieldSource.h index 5dba29ac5..2518d1fca 100644 --- a/Utilities/itkSimulatedExponentialDisplacementFieldSource.h +++ b/Utilities/itkSimulatedExponentialDisplacementFieldSource.h @@ -53,7 +53,7 @@ class SimulatedExponentialDisplacementFieldSource final : public SimulatedDispla itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(SimulatedExponentialDisplacementFieldSource, SimulatedDisplacementFieldSource); + itkOverrideGetNameOfClassMacro(SimulatedExponentialDisplacementFieldSource); /** Number of dimensions */ static constexpr unsigned int ImageDimension = TOutputImage::ImageDimension; diff --git a/Utilities/itkSliceTimingCorrectionImageFilter.h b/Utilities/itkSliceTimingCorrectionImageFilter.h index e23172f93..c6e33cd26 100644 --- a/Utilities/itkSliceTimingCorrectionImageFilter.h +++ b/Utilities/itkSliceTimingCorrectionImageFilter.h @@ -54,7 +54,7 @@ class SliceTimingCorrectionImageFilter final : public ImageToImageFilter; /** Run-time type information (and related methods). */ - itkTypeMacro(SurfaceCurvatureBase, ProcessObject); + itkOverrideGetNameOfClassMacro(SurfaceCurvatureBase); /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/Utilities/itkSurfaceImageCurvature.h b/Utilities/itkSurfaceImageCurvature.h index b445cfd4d..99302dfba 100644 --- a/Utilities/itkSurfaceImageCurvature.h +++ b/Utilities/itkSurfaceImageCurvature.h @@ -41,7 +41,7 @@ class SurfaceImageCurvature final : public SurfaceCurvatureBase typedef SmartPointer ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(SurfaceImageCurvature, SurfaceCurvatureBase); + itkOverrideGetNameOfClassMacro(SurfaceImageCurvature); /** Method for creation through the object factory. */ itkNewMacro(Self); @@ -52,7 +52,7 @@ class SurfaceImageCurvature final : public SurfaceCurvatureBase { ImageDimension = TSurface::ImageDimension }; - typedef Image ImageType; + typedef Image ImageType; typedef typename ImageType::IndexType IndexType; typedef typename ImageType::SpacingType SpacingType; typedef typename ImageType::SizeType SizeType; @@ -67,16 +67,16 @@ class SurfaceImageCurvature final : public SurfaceCurvatureBase typedef typename Superclass::MatrixType MatrixType; typedef typename ImageType::PointType ImagePointType; - typedef Image OutputImageType; + typedef Image OutputImageType; typedef ImageRegionIteratorWithIndex OutputImageIteratorType; typedef typename OutputImageType::Pointer OutputImagePointer; - typedef Image FrameImageType; + typedef Image FrameImageType; /** Gradient filtering */ - typedef CovariantVector GradientPixelType; - typedef Image GradientImageType; + typedef CovariantVector GradientPixelType; + typedef Image GradientImageType; typedef itk::VectorLinearInterpolateImageFunction VectorInterpolatorType; typedef SmartPointer GradientImagePointer; typedef GradientRecursiveGaussianImageFilter GradientImageFilterType; diff --git a/Utilities/itkSurfaceMeshCurvature.h b/Utilities/itkSurfaceMeshCurvature.h index cce6d5fc0..8dce384a9 100644 --- a/Utilities/itkSurfaceMeshCurvature.h +++ b/Utilities/itkSurfaceMeshCurvature.h @@ -36,7 +36,7 @@ class SurfaceMeshCurvature : public SurfaceCurvatureBase typedef SmartPointer ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(SurfaceMeshCurvature, SurfaceCurvatureBase); + itkOverrideGetNameOfClassMacro(SurfaceMeshCurvature); /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/Utilities/itkVectorFieldGradientImageFunction.h b/Utilities/itkVectorFieldGradientImageFunction.h index 3496b0ff1..bfbe4ad20 100644 --- a/Utilities/itkVectorFieldGradientImageFunction.h +++ b/Utilities/itkVectorFieldGradientImageFunction.h @@ -36,7 +36,7 @@ class VectorFieldGradientImageFunction final : public ImageFunction ConstPointer; /** Run-time type information (and related methods). */ - itkTypeMacro(VectorGaussianInterpolateImageFunction, InterpolateImageFunction); + itkOverrideGetNameOfClassMacro(VectorGaussianInterpolateImageFunction); /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/Utilities/itkVectorImageFileReader.h b/Utilities/itkVectorImageFileReader.h index 4e8a40d5c..29da32b25 100644 --- a/Utilities/itkVectorImageFileReader.h +++ b/Utilities/itkVectorImageFileReader.h @@ -28,7 +28,7 @@ class VectorImageFileReaderException : public ExceptionObject { public: /** Run-time information. */ - itkTypeMacro(VectorImageFileReaderException, ExceptionObject); + itkOverrideGetNameOfClassMacro(VectorImageFileReaderException); /** Constructor. */ VectorImageFileReaderException(const char * file, @@ -92,7 +92,7 @@ class VectorImageFileReader : public ImageSource itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(VectorImageFileReader, ImageSource); + itkOverrideGetNameOfClassMacro(VectorImageFileReader); /** Image types */ typedef typename TImage::RegionType ImageRegionType; diff --git a/Utilities/itkVectorImageFileWriter.h b/Utilities/itkVectorImageFileWriter.h index 2ddeab9b1..94df61bb9 100644 --- a/Utilities/itkVectorImageFileWriter.h +++ b/Utilities/itkVectorImageFileWriter.h @@ -29,7 +29,7 @@ class VectorImageFileWriterException : public ExceptionObject { public: /** Run-time information. */ - itkTypeMacro(VectorImageFileWriterException, ExceptionObject); + itkOverrideGetNameOfClassMacro(VectorImageFileWriterException); /** Constructor. */ VectorImageFileWriterException(const char * file, @@ -71,7 +71,7 @@ class VectorImageFileWriter : public ProcessObject itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(VectorImageFileWriter, VectorImageFileWriter); + itkOverrideGetNameOfClassMacro(VectorImageFileWriter); /** Some convenient typedefs. */ typedef TVectorImage VectorImageType; diff --git a/Utilities/itkWarpImageMultiTransformFilter.h b/Utilities/itkWarpImageMultiTransformFilter.h index c717bb331..dc482ff69 100644 --- a/Utilities/itkWarpImageMultiTransformFilter.h +++ b/Utilities/itkWarpImageMultiTransformFilter.h @@ -99,7 +99,7 @@ class WarpImageMultiTransformFilter : public ImageToImageFilter ImageBaseType; + typedef ImageBase ImageBaseType; /** Deformation field typedef support. */ typedef TDisplacementField DisplacementFieldType; @@ -144,7 +144,7 @@ class WarpImageMultiTransformFilter : public ImageToImageFilter PointType; + typedef Point PointType; typedef struct _DeformationTypeEx { diff --git a/Utilities/itkWarpImageWAffineFilter.h b/Utilities/itkWarpImageWAffineFilter.h index 0678905c2..5ddd3644b 100644 --- a/Utilities/itkWarpImageWAffineFilter.h +++ b/Utilities/itkWarpImageWAffineFilter.h @@ -94,7 +94,7 @@ class WarpImageWAffineFilter : public ImageToImageFilter DefaultInterpolatorType; /** Point type */ - typedef Point PointType; + typedef Point PointType; /** Set the deformation field. */ void diff --git a/Utilities/itkWarpTensorImageMultiTransformFilter.h b/Utilities/itkWarpTensorImageMultiTransformFilter.h index 58e3d2444..0edc122aa 100644 --- a/Utilities/itkWarpTensorImageMultiTransformFilter.h +++ b/Utilities/itkWarpTensorImageMultiTransformFilter.h @@ -98,7 +98,7 @@ class WarpTensorImageMultiTransformFilter : public ImageToImageFilter PointType; + typedef Point PointType; typedef struct _DeformationTypeEx {