From 2abf238a0804f55779503ea9b0e0990ecfa9a38c Mon Sep 17 00:00:00 2001
From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Tue, 9 Jan 2024 12:30:09 +0100
Subject: [PATCH] STYLE: Replace additional itkTypeMacro calls with
 `itkOverrideGetNameOfClassMacro`

Some were missed by regular expression in
eb90fb42b9dca3fe8be373e2b7c9724e4c3b6156 due to missing digits and _
---
 include/rtkConjugateGradientGetP_kPlusOneImageFilter.h |  4 ++++
 include/rtkConjugateGradientGetR_kPlusOneImageFilter.h |  4 ++++
 include/rtkConjugateGradientGetX_kPlusOneImageFilter.h |  4 ++++
 include/rtkElektaXVI5GeometryXMLFileReader.h           |  4 ++++
 include/rtkI0EstimationProjectionFilter.h              |  6 +++++-
 .../rtkLUTbasedVariableI0RawToAttenuationImageFilter.h |  4 ++++
 .../rtkLastDimensionL0GradientDenoisingImageFilter.h   |  4 ++++
 include/rtkMagnitudeThresholdImageFilter.h             |  2 +-
 ...ourDConjugateGradientConeBeamReconstructionFilter.h |  4 ++++
 ...mpensatedFourDROOSTERConeBeamReconstructionFilter.h |  7 +++++--
 ...satedFourDReconstructionConjugateGradientOperator.h |  4 ++++
 include/rtkReg1DExtractShroudSignalImageFilter.h       |  5 +++++
 include/rtkSchlomka2008NegativeLogLikelihood.h         | 10 +++++++++-
 13 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h
index f4d58639b..d3f49ee7f 100644
--- a/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h
+++ b/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h
@@ -49,7 +49,11 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetP_kPlusOneImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ConjugateGradientGetP_kPlusOneImageFilter);
+#else
   itkTypeMacro(ConjugateGradientGetP_kPlusOneImageFilter, itk::ImageToImageFilter);
+#endif
 
   /** Functions to set the inputs */
   void
diff --git a/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h
index 8dc098863..ce8d1ac7e 100644
--- a/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h
+++ b/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h
@@ -50,7 +50,11 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetR_kPlusOneImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ConjugateGradientGetR_kPlusOneImageFilter);
+#else
   itkTypeMacro(ConjugateGradientGetR_kPlusOneImageFilter, itk::ImageToImageFilter);
+#endif
 
   /** Functions to set the inputs */
   void
diff --git a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h
index 34314b4cd..7323a02e0 100644
--- a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h
+++ b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h
@@ -49,7 +49,11 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetX_kPlusOneImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ConjugateGradientGetX_kPlusOneImageFilter);
+#else
   itkTypeMacro(ConjugateGradientGetX_kPlusOneImageFilter, itk::ImageToImageFilter);
+#endif
 
   /** Functions to set the inputs */
   void
diff --git a/include/rtkElektaXVI5GeometryXMLFileReader.h b/include/rtkElektaXVI5GeometryXMLFileReader.h
index c608acfdc..5e3da3b67 100644
--- a/include/rtkElektaXVI5GeometryXMLFileReader.h
+++ b/include/rtkElektaXVI5GeometryXMLFileReader.h
@@ -61,7 +61,11 @@ class RTK_EXPORT ElektaXVI5GeometryXMLFileReader : public itk::XMLReader<ThreeDC
   static const unsigned int CurrentVersion = 2;
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ElektaXVI5GeometryXMLFileReader);
+#else
   itkTypeMacro(ElektaXVI5GeometryXMLFileReader, itk::XMLFileReader);
+#endif
 
   /** Method for creation through the object factory. */
   itkNewMacro(Self);
diff --git a/include/rtkI0EstimationProjectionFilter.h b/include/rtkI0EstimationProjectionFilter.h
index fe573dbad..feeea1fc1 100644
--- a/include/rtkI0EstimationProjectionFilter.h
+++ b/include/rtkI0EstimationProjectionFilter.h
@@ -58,7 +58,11 @@ class ITK_TEMPLATE_EXPORT I0EstimationProjectionFilter : public itk::InPlaceImag
   itkNewMacro(Self);
 
   /** Runtime information support. */
-  itkTypeMacro(I0EstimationProjectionFilter, ImageToImageFilter);
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(I0EstimationProjectionFilter);
+#else
+  itkTypeMacro(I0EstimationProjectionFilter, itk::InPlaceImageFilter);
+#endif
 
   /** Some convenient type alias. */
   using InputImageType = TInputImage;
diff --git a/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h b/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h
index 2982ac498..3a072b4b7 100644
--- a/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h
+++ b/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h
@@ -98,7 +98,11 @@ class ITK_TEMPLATE_EXPORT LUTbasedVariableI0RawToAttenuationImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(LUTbasedVariableI0RawToAttenuationImageFilter);
+#else
   itkTypeMacro(LUTbasedVariableI0RawToAttenuationImageFilter, LookupTableImageFilter);
+#endif
 
   /** Air level I0
    */
diff --git a/include/rtkLastDimensionL0GradientDenoisingImageFilter.h b/include/rtkLastDimensionL0GradientDenoisingImageFilter.h
index 14063094c..44493fc14 100644
--- a/include/rtkLastDimensionL0GradientDenoisingImageFilter.h
+++ b/include/rtkLastDimensionL0GradientDenoisingImageFilter.h
@@ -56,7 +56,11 @@ class ITK_TEMPLATE_EXPORT LastDimensionL0GradientDenoisingImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(LastDimensionL0GradientDenoisingImageFilter);
+#else
   itkTypeMacro(LastDimensionL0GradientDenoisingImageFilter, itk::InPlaceImageFilter);
+#endif
 
   /** Get / Set the threshold. Default is 0.001 */
   itkGetMacro(Lambda, double);
diff --git a/include/rtkMagnitudeThresholdImageFilter.h b/include/rtkMagnitudeThresholdImageFilter.h
index 1465145af..1f6d86879 100644
--- a/include/rtkMagnitudeThresholdImageFilter.h
+++ b/include/rtkMagnitudeThresholdImageFilter.h
@@ -55,7 +55,7 @@ class ITK_TEMPLATE_EXPORT MagnitudeThresholdImageFilter : public itk::InPlaceIma
 #ifdef itkOverrideGetNameOfClassMacro
   itkOverrideGetNameOfClassMacro(MagnitudeThresholdImageFilter);
 #else
-  itkTypeMacro(MagnitudeThresholdImageFilter, ImageToImageFilter);
+  itkTypeMacro(MagnitudeThresholdImageFilter, itk::ImageToImageFilter);
 #endif
 
   /** Extract some information from the image types.  Dimensionality
diff --git a/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h b/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h
index f7a3b495b..d78d0d069 100644
--- a/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h
+++ b/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h
@@ -111,8 +111,12 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDConjugateGradientConeBeamReconst
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter);
+#else
   itkTypeMacro(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter,
                FourDConjugateGradientConeBeamReconstructionFilter);
+#endif
 
   /** Neither the Forward nor the Back projection filters can be set by the user */
   void
diff --git a/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h b/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h
index 3432a64c4..4b66ad4ff 100644
--- a/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h
+++ b/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h
@@ -172,8 +172,11 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDROOSTERConeBeamReconstructionFil
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter,
-               rtk::FourDROOSTERConeBeamReconstructionFilter);
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter);
+#else
+  itkTypeMacro(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter, FourDROOSTERConeBeamReconstructionFilter);
+#endif
 
   using MotionCompensatedFourDCGFilterType =
     rtk::MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter<VolumeSeriesType, ProjectionStackType>;
diff --git a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h
index 7af6fc66e..78a2e59d0 100644
--- a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h
+++ b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h
@@ -150,8 +150,12 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDReconstructionConjugateGradientO
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(MotionCompensatedFourDReconstructionConjugateGradientOperator);
+#else
   itkTypeMacro(MotionCompensatedFourDReconstructionConjugateGradientOperator,
                FourDReconstructionConjugateGradientOperator);
+#endif
 
   /** The forward and back projection filters cannot be set by the user */
   void
diff --git a/include/rtkReg1DExtractShroudSignalImageFilter.h b/include/rtkReg1DExtractShroudSignalImageFilter.h
index b4e1f017a..96059ffbf 100644
--- a/include/rtkReg1DExtractShroudSignalImageFilter.h
+++ b/include/rtkReg1DExtractShroudSignalImageFilter.h
@@ -58,7 +58,12 @@ class ITK_TEMPLATE_EXPORT Reg1DExtractShroudSignalImageFilter
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(Reg1DExtractShroudSignalImageFilter);
+#else
   itkTypeMacro(Reg1DExtractShroudSignalImageFilter, itk::ImageToImageFilter);
+#endif
+
 
 protected:
   Reg1DExtractShroudSignalImageFilter();
diff --git a/include/rtkSchlomka2008NegativeLogLikelihood.h b/include/rtkSchlomka2008NegativeLogLikelihood.h
index 9361cd2f0..02685f9aa 100644
--- a/include/rtkSchlomka2008NegativeLogLikelihood.h
+++ b/include/rtkSchlomka2008NegativeLogLikelihood.h
@@ -51,8 +51,16 @@ class Schlomka2008NegativeLogLikelihood : public rtk::ProjectionsDecompositionNe
   using Superclass = rtk::ProjectionsDecompositionNegativeLogLikelihood;
   using Pointer = itk::SmartPointer<Self>;
   using ConstPointer = itk::SmartPointer<const Self>;
+
+  /** Method for creation through the object factory. */
   itkNewMacro(Self);
-  itkTypeMacro(Schlomka2008NegativeLogLikelihood, rtk::ProjectionsDecompositionNegativeLogLikelihood);
+
+  /** Run-time type information (and related methods) */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(Schlomka2008NegativeLogLikelihood);
+#else
+  itkTypeMacro(Schlomka2008NegativeLogLikelihood, ProjectionsDecompositionNegativeLogLikelihood);
+#endif
 
   using ParametersType = Superclass::ParametersType;
   using DerivativeType = Superclass::DerivativeType;