ANTsX · ntustison · Jan 27, 2025 · Jan 26, 2025
diff --git 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
@@ -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
@@ -30,8 +30,8 @@ class ANTSAffine3DTransform final : public MatrixOffsetTransformBase<TScalarType
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods).   */
-  // itkTypeMacro( ANTSAffine3DTransform, Rigid3DTransform );
-  itkTypeMacro(ANTSAffine3DTransform, MatrixOffsetTransformBase);
+  // itkOverrideGetNameOfClassMacro( ANTSAffine3DTransform);
+  itkOverrideGetNameOfClassMacro(ANTSAffine3DTransform);
 
   /** Dimension of parameters   */
   static constexpr unsigned int InputSpaceDimension = 3;

diff --git a/ImageRegistration/itkANTSCenteredAffine2DTransform.h b/ImageRegistration/itkANTSCenteredAffine2DTransform.h
@@ -22,8 +22,8 @@ class ANTSCenteredAffine2DTransform final
   typedef SmartPointer<const Self>                     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.h b/ImageRegistration/itkANTSImageRegistrationOptimizer.h
@@ -66,7 +66,7 @@ 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;
 

diff --git a/ImageRegistration/itkANTSImageTransformation.h b/ImageRegistration/itkANTSImageTransformation.h
@@ -46,7 +46,7 @@ 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;
 

diff --git a/ImageRegistration/itkANTSLabeledPointSet.h b/ImageRegistration/itkANTSLabeledPointSet.h
@@ -37,7 +37,7 @@ 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;

diff --git a/ImageRegistration/itkANTSSimilarityMetric.h b/ImageRegistration/itkANTSSimilarityMetric.h
@@ -38,7 +38,7 @@ 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;

diff --git 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;

diff --git a/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h b/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h
@@ -45,7 +45,7 @@ class AvantsPDEDeformableRegistrationFunction
   typedef SmartPointer<const Self>                                                         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
@@ -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;

diff --git 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
@@ -41,7 +41,7 @@ class JensenHavrdaCharvatTsallisLabeledPointSetMetric : public PointSetToPointSe
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(JensenHavrdaCharvatTsallisLabeledPointSetMetric, PointSetToLabelPointSetMetric);
+  itkOverrideGetNameOfClassMacro(JensenHavrdaCharvatTsallisLabeledPointSetMetric);
 
   itkStaticConstMacro(PointDimension, unsigned int, TPointSet::PointDimension);
 

diff --git a/ImageRegistration/itkJensenHavrdaCharvatTsallisPointSetMetric.h b/ImageRegistration/itkJensenHavrdaCharvatTsallisPointSetMetric.h
@@ -40,7 +40,7 @@ class JensenHavrdaCharvatTsallisPointSetMetric : public PointSetToPointSetMetric
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(JensenHavrdaCharvatTsallisPointSetMetric, PointSetToPointSetMetric);
+  itkOverrideGetNameOfClassMacro(JensenHavrdaCharvatTsallisPointSetMetric);
 
   itkStaticConstMacro(PointDimension, unsigned int, TPointSet::PointDimension);
 

diff --git a/ImageRegistration/itkJensenTsallisBSplineRegistrationFunction.h b/ImageRegistration/itkJensenTsallisBSplineRegistrationFunction.h
@@ -45,7 +45,7 @@ class JensenTsallisBSplineRegistrationFunction
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(JensenTsallisBSplineRegistrationFunction, AvantsPDEDeformableRegistrationFunction);
+  itkOverrideGetNameOfClassMacro(JensenTsallisBSplineRegistrationFunction);
 
   /**
    * Inherit some enums from the superclass.

diff --git a/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h b/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h
@@ -41,7 +41,7 @@ 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;

diff --git 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;

diff --git 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;

diff --git 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;

diff --git 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. */

diff --git a/ImageSegmentation/antsAtroposSegmentationImageFilter.h b/ImageSegmentation/antsAtroposSegmentationImageFilter.h
@@ -75,7 +75,7 @@ class AtroposSegmentationImageFilter final : public ImageToImageFilter<TInputIma
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(AtroposSegmentationImageFilter, ImageToImageFilter);
+  itkOverrideGetNameOfClassMacro(AtroposSegmentationImageFilter);
 
   /** Dimension of the images. */
   itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension);

diff --git a/ImageSegmentation/antsBoxPlotQuantileListSampleFilter.h b/ImageSegmentation/antsBoxPlotQuantileListSampleFilter.h
@@ -46,7 +46,7 @@ class BoxPlotQuantileListSampleFilter final : public ListSampleToListSampleFilte
   /**
    * Standard macros
    */
-  itkTypeMacro(BoxPlotQuantileListSampleFilter, ListSampleToScalarListSampleFilter);
+  itkOverrideGetNameOfClassMacro(BoxPlotQuantileListSampleFilter);
 
   /**
    * Method for creation through the object factory.

diff --git a/ImageSegmentation/antsGaussianListSampleFunction.h b/ImageSegmentation/antsGaussianListSampleFunction.h
@@ -42,7 +42,7 @@ class GaussianListSampleFunction final : public ListSampleFunction<TListSample,
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(GaussianListSampleFunction, ListSampleFunction);
+  itkOverrideGetNameOfClassMacro(GaussianListSampleFunction);
 
   typedef typename Superclass::InputListSampleType        InputListSampleType;
   typedef typename Superclass::InputMeasurementVectorType InputMeasurementVectorType;

diff --git a/ImageSegmentation/antsGrubbsRosnerListSampleFilter.h b/ImageSegmentation/antsGrubbsRosnerListSampleFilter.h
@@ -46,7 +46,7 @@ class GrubbsRosnerListSampleFilter final : public ListSampleToListSampleFilter<T
   /**
    * Standard macros
    */
-  itkTypeMacro(GrubbsRosnerListSampleFilter, ListSampleToScalarListSampleFilter);
+  itkOverrideGetNameOfClassMacro(GrubbsRosnerListSampleFilter);
 
   /**
    * Method for creation through the object factory.

diff --git a/ImageSegmentation/antsHistogramParzenWindowsListSampleFunction.h b/ImageSegmentation/antsHistogramParzenWindowsListSampleFunction.h
@@ -44,7 +44,7 @@ class HistogramParzenWindowsListSampleFunction final : public ListSampleFunction
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(HistogramParzenWindowsListSampleFunction, ListSampleFunction);
+  itkOverrideGetNameOfClassMacro(HistogramParzenWindowsListSampleFunction);
 
   typedef typename Superclass::InputListSampleType        InputListSampleType;
   typedef typename Superclass::InputMeasurementVectorType InputMeasurementVectorType;

diff --git a/ImageSegmentation/antsJointHistogramParzenShapeAndOrientationListSampleFunction.h b/ImageSegmentation/antsJointHistogramParzenShapeAndOrientationListSampleFunction.h
@@ -44,7 +44,7 @@ class JointHistogramParzenShapeAndOrientationListSampleFunction final
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(JointHistogramParzenShapeAndOrientationListSampleFunction, ListSampleFunction);
+  itkOverrideGetNameOfClassMacro(JointHistogramParzenShapeAndOrientationListSampleFunction);
 
   typedef typename Superclass::InputListSampleType        InputListSampleType;
   typedef typename Superclass::InputMeasurementVectorType InputMeasurementVectorType;

diff --git a/ImageSegmentation/antsJointHistogramParzenWindowsListSampleFunction.h b/ImageSegmentation/antsJointHistogramParzenWindowsListSampleFunction.h
@@ -42,7 +42,7 @@ class JointHistogramParzenWindowsListSampleFunction : public ListSampleFunction<
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(JointHistogramParzenWindowsListSampleFunction, ListSampleFunction);
+  itkOverrideGetNameOfClassMacro(JointHistogramParzenWindowsListSampleFunction);
 
   typedef typename Superclass::InputListSampleType        InputListSampleType;
   typedef typename Superclass::InputMeasurementVectorType InputMeasurementVectorType;

diff --git a/ImageSegmentation/antsListSampleFunction.h b/ImageSegmentation/antsListSampleFunction.h
@@ -50,7 +50,7 @@ class ListSampleFunction : public FunctionBase<typename TInputListSample::Measur
   typedef SmartPointer<const Self>                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
@@ -46,7 +46,7 @@ class ListSampleToListSampleFilter : public ProcessObject
   typedef SmartPointer<const Self>     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
@@ -42,7 +42,7 @@ class LogEuclideanGaussianListSampleFunction final : public ListSampleFunction<T
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(LogEuclideanGaussianListSampleFunction, ListSampleFunction);
+  itkOverrideGetNameOfClassMacro(LogEuclideanGaussianListSampleFunction);
 
   typedef typename Superclass::InputListSampleType        InputListSampleType;
   typedef typename Superclass::InputMeasurementVectorType InputMeasurementVectorType;

diff --git a/ImageSegmentation/antsManifoldParzenWindowsListSampleFunction.h b/ImageSegmentation/antsManifoldParzenWindowsListSampleFunction.h
@@ -45,7 +45,7 @@ class ManifoldParzenWindowsListSampleFunction final : public ListSampleFunction<
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(ManifoldParzenWindowsListSampleFunction, ListSampleFunction);
+  itkOverrideGetNameOfClassMacro(ManifoldParzenWindowsListSampleFunction);
 
   typedef typename Superclass::InputListSampleType        InputListSampleType;
   typedef typename Superclass::InputMeasurementVectorType InputMeasurementVectorType;

diff --git a/ImageSegmentation/antsPartialVolumeGaussianListSampleFunction.h b/ImageSegmentation/antsPartialVolumeGaussianListSampleFunction.h
@@ -42,7 +42,7 @@ class PartialVolumeGaussianListSampleFunction final : public ListSampleFunction<
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(PartialVolumeGaussianListSampleFunction, ListSampleFunction);
+  itkOverrideGetNameOfClassMacro(PartialVolumeGaussianListSampleFunction);
 
   typedef typename Superclass::InputListSampleType        InputListSampleType;
   typedef typename Superclass::InputMeasurementVectorType InputMeasurementVectorType;

diff --git a/ImageSegmentation/antsPassThroughListSampleFilter.h b/ImageSegmentation/antsPassThroughListSampleFilter.h
@@ -43,7 +43,7 @@ class PassThroughListSampleFilter : public ListSampleToListSampleFilter<TListSam
   /**
    * Standard macros
    */
-  itkTypeMacro(PassThroughListSampleFilter, ListSampleToScalarListSampleFilter);
+  itkOverrideGetNameOfClassMacro(PassThroughListSampleFilter);
 
   /**
    * Method for creation through the object factory.

diff --git a/ImageSegmentation/itkWeightedVotingFusionImageFilter.h b/ImageSegmentation/itkWeightedVotingFusionImageFilter.h
@@ -61,7 +61,7 @@ class WeightedVotingFusionImageFilter final : public NonLocalPatchBasedImageFilt
   typedef SmartPointer<const Self>                                 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
@@ -111,7 +111,7 @@ class FMarchingImageFilter final : public ImageToImageFilter<TSpeedImage, TLevel
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(FMarchingImageFilter, ImageSource);
+  itkOverrideGetNameOfClassMacro(FMarchingImageFilter);
 
   /** Typedef support of level set method types. */
   typedef LevelSetTypeDefault<TLevelSet>              LevelSetType;

diff --git 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
@@ -77,7 +77,7 @@ typename GraphSearchNode : public itk::LightObject
   typedef LightObject              Superclass;
   typedef SmartPointer<Self>       Pointer;
   typedef SmartPointer<const Self> 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<Self>       Pointer;
 typedef SmartPointer<const Self> 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<Self>       Pointer;
   typedef SmartPointer<const Self> ConstPointer;
-  itkTypeMacro(DijkstrasAlgorithm, LightObject);
+  itkOverrideGetNameOfClassMacro(DijkstrasAlgorithm);
   itkNewMacro(Self);
 
   // Computation Data

diff --git a/Temporary/itkFEMConformalMap.h b/Temporary/itkFEMConformalMap.h
@@ -83,7 +83,7 @@ class FEMConformalMap : public ProcessObject
   typedef SmartPointer<const Self> ConstPointer;
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(FEMConformalMap, ProcessObject);
+  itkOverrideGetNameOfClassMacro(FEMConformalMap);
 
   /** Method for creation through the object factory. */
   itkNewMacro(Self);

diff --git a/Temporary/itkFEMDiscConformalMap.h b/Temporary/itkFEMDiscConformalMap.h
@@ -87,7 +87,7 @@ class FEMDiscConformalMap : public ProcessObject
   typedef SmartPointer<const Self> ConstPointer;
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(FEMDiscConformalMap, ProcessObject);
+  itkOverrideGetNameOfClassMacro(FEMDiscConformalMap);
 
   /** Method for creation through the object factory. */
   itkNewMacro(Self);

diff --git a/Temporary/itkManifoldIntegrationAlgorithm.h b/Temporary/itkManifoldIntegrationAlgorithm.h
@@ -51,7 +51,7 @@ class ManifoldIntegrationAlgorithm : public itk::LightObject
   typedef LightObject                  Superclass;
   typedef SmartPointer<Self>           Pointer;
   typedef SmartPointer<const Self>     ConstPointer;
-  itkTypeMacro(ManifoldIntegrationAlgorithm, LightObject);
+  itkOverrideGetNameOfClassMacro(ManifoldIntegrationAlgorithm);
   itkNewMacro(Self);
 
   // Computation Data

diff --git 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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,7 +125,7 @@ class antsCommandIterationUpdate : public itk::Command @@
       /**
        * Run-time type information (and related methods).
        */
-      itkTypeMacro(antsCommandIterationUpdate, itk::Command);
+      itkOverrideGetNameOfClassMacro(antsCommandIterationUpdate);
       /**
@@ Expand Down @@