From 88ed876ae988e2cd733d64e390ea86d42208a45c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C5=BEenan=20Zuki=C4=87?= Date: Tue, 15 Oct 2024 14:16:18 -0400 Subject: [PATCH] COMP: Use newer itkOverrideGetNameOfClassMacro instead of itkTypeMacro --- include/itkGridTransform.h | 2 +- include/itkIRRefineGrid.h | 2 +- include/itkImageMosaicVarianceMetric.h | 2 +- include/itkInverseTransform.h | 2 +- include/itkLegendrePolynomialTransform.h | 2 +- include/itkMeshTransform.h | 2 +- include/itkNormalizeImageFilterWithMask.h | 2 +- include/itkRBFTransform.h | 2 +- include/itkRadialDistortionTransform.h | 2 +- include/itkRegularStepGradientDescentOptimizer2.h | 3 +-- include/itkStatisticsImageFilterWithMask.h | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/itkGridTransform.h b/include/itkGridTransform.h index 32639ff..5a0305b 100644 --- a/include/itkGridTransform.h +++ b/include/itkGridTransform.h @@ -69,7 +69,7 @@ class GridTransform : public Transform typedef SmartPointer InverseTransformPointer; // RTTI: - itkTypeMacro(GridTransform, Transform); + itkOverrideGetNameOfClassMacro(GridTransform); // macro for instantiation through the object factory: itkNewMacro(Self); diff --git a/include/itkIRRefineGrid.h b/include/itkIRRefineGrid.h index 0d77f33..bd5c88a 100644 --- a/include/itkIRRefineGrid.h +++ b/include/itkIRRefineGrid.h @@ -54,7 +54,7 @@ class IRRefineGrid : public ImageToImageFilter using ConstPointer = SmartPointer; /** Run-time type information. */ - itkTypeMacro(IRRefineGrid, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(IRRefineGrid); /** Standard New macro. */ itkNewMacro(Self); diff --git a/include/itkImageMosaicVarianceMetric.h b/include/itkImageMosaicVarianceMetric.h index 06ad4c1..6ad864d 100644 --- a/include/itkImageMosaicVarianceMetric.h +++ b/include/itkImageMosaicVarianceMetric.h @@ -75,7 +75,7 @@ class ITK_EXPORT ImageMosaicVarianceMetric : public SingleValuedCostFunction itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(ImageMosaicVarianceMetric, SingleValuedCostFunction); + itkOverrideGetNameOfClassMacro(ImageMosaicVarianceMetric); /** Type of the moving Image. */ typedef TInterpolator interpolator_t; diff --git a/include/itkInverseTransform.h b/include/itkInverseTransform.h index 9d3c49a..7baf75c 100644 --- a/include/itkInverseTransform.h +++ b/include/itkInverseTransform.h @@ -70,7 +70,7 @@ namespace itk itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro( InverseTransform, Transform ); + itkOverrideGetNameOfClassMacro(InverseTransform); /** Standard scalar type for this class. */ typedef typename Superclass::ScalarType ScalarType; diff --git a/include/itkLegendrePolynomialTransform.h b/include/itkLegendrePolynomialTransform.h index ab09108..89cdf40 100644 --- a/include/itkLegendrePolynomialTransform.h +++ b/include/itkLegendrePolynomialTransform.h @@ -94,7 +94,7 @@ class LegendrePolynomialTransform : public Transform itkStaticConstMacro(ParameterVectorLength, unsigned int, (N + 1) * (N + 2)); // RTTI: - itkTypeMacro(LegendrePolynomialTransform, Transform); + itkOverrideGetNameOfClassMacro(LegendrePolynomialTransform); // macro for instantiation through the object factory: itkNewMacro(Self); diff --git a/include/itkMeshTransform.h b/include/itkMeshTransform.h index 48ad8ca..2049150 100644 --- a/include/itkMeshTransform.h +++ b/include/itkMeshTransform.h @@ -69,7 +69,7 @@ class MeshTransform : public Transform typedef SmartPointer InverseTransformPointer; // RTTI: - itkTypeMacro(MeshTransform, Transform); + itkOverrideGetNameOfClassMacro(MeshTransform); // macro for instantiation through the object factory: itkNewMacro(Self); diff --git a/include/itkNormalizeImageFilterWithMask.h b/include/itkNormalizeImageFilterWithMask.h index c0163e6..9c6d68b 100644 --- a/include/itkNormalizeImageFilterWithMask.h +++ b/include/itkNormalizeImageFilterWithMask.h @@ -68,7 +68,7 @@ class ITK_EXPORT NormalizeImageFilterWithMask : itkNewMacro(Self); /** Runtime information support. */ - itkTypeMacro(NormalizeImageFilterWithMask, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(NormalizeImageFilterWithMask); /** Image related typedefs. */ typedef typename TInputImage::Pointer InputImagePointer; diff --git a/include/itkRBFTransform.h b/include/itkRBFTransform.h index bca2f29..36a8fab 100644 --- a/include/itkRBFTransform.h +++ b/include/itkRBFTransform.h @@ -84,7 +84,7 @@ class RBFTransform : public Transform typedef SmartPointer InverseTransformPointer; // RTTI: - itkTypeMacro(RBFTransform, Transform); + itkOverrideGetNameOfClassMacro(RBFTransform); // macro for instantiation through the object factory: itkNewMacro(Self); diff --git a/include/itkRadialDistortionTransform.h b/include/itkRadialDistortionTransform.h index 0851610..9245c09 100644 --- a/include/itkRadialDistortionTransform.h +++ b/include/itkRadialDistortionTransform.h @@ -84,7 +84,7 @@ class RadialDistortionTransform : public Transform itkStaticConstMacro(Nk, unsigned int, N); // RTTI: - itkTypeMacro(RadialDistortionTransform, Transform); + itkOverrideGetNameOfClassMacro(RadialDistortionTransform); // macro for instantiation through the object factory: itkNewMacro(Self); diff --git a/include/itkRegularStepGradientDescentOptimizer2.h b/include/itkRegularStepGradientDescentOptimizer2.h index 6913210..33d3dcc 100644 --- a/include/itkRegularStepGradientDescentOptimizer2.h +++ b/include/itkRegularStepGradientDescentOptimizer2.h @@ -64,8 +64,7 @@ class ITK_EXPORT RegularStepGradientDescentOptimizer2 : itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(RegularStepGradientDescentOptimizer2, - SingleValuedNonLinearOptimizer); + itkOverrideGetNameOfClassMacro(RegularStepGradientDescentOptimizer2); //---------------------------------------------------------------- // StopConditionType diff --git a/include/itkStatisticsImageFilterWithMask.h b/include/itkStatisticsImageFilterWithMask.h index 1e111f8..ad22ee8 100644 --- a/include/itkStatisticsImageFilterWithMask.h +++ b/include/itkStatisticsImageFilterWithMask.h @@ -70,7 +70,7 @@ class ITK_EXPORT StatisticsImageFilterWithMask : itkNewMacro(Self); /** Runtime information support. */ - itkTypeMacro(StatisticsImageFilterWithMask, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(StatisticsImageFilterWithMask); /** Image related typedefs. */ typedef typename TInputImage::Pointer InputImagePointer;