STYLE: Replace itkTypeMacro calls with itkOverrideGetNameOfClassMacro

Follows InsightSoftwareConsortium/ITK@2c264ea Done with command: sed -i "s/^\( *\)itkTypeMacro(\([:a-zA-Z]*\), \([:a-zA-Z]*\));/#ifdef itkOverrideGetNameOfClassMacro\n\1itkOverrideGetNameOfClassMacro(\2);\n#else\n\1itkTypeMacro(\2, \3);\n#endif/g" *
RTKConsortium · Jan 8, 2024 · eb90fb4 · eb90fb4
1 parent 6109465
commit eb90fb4
Show file tree

Hide file tree

Showing 199 changed files with 796 additions and 0 deletions.
diff --git a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h
@@ -152,7 +152,11 @@ class ITK_TEMPLATE_EXPORT ADMMTotalVariationConeBeamReconstructionFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ADMMTotalVariationConeBeamReconstructionFilter);
+#else
   itkTypeMacro(ADMMTotalVariationConeBeamReconstructionFilter, IterativeConeBeamReconstructionFilter);
+#endif
 
   using ForwardProjectionFilterType = rtk::ForwardProjectionImageFilter<TOutputImage, TOutputImage>;
   using ForwardProjectionFilterPointer = typename ForwardProjectionFilterType::Pointer;

diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.h b/include/rtkADMMTotalVariationConjugateGradientOperator.h
@@ -118,7 +118,11 @@ class ITK_TEMPLATE_EXPORT ADMMTotalVariationConjugateGradientOperator : public C
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(rtkADMMTotalVariationConjugateGradientOperator);
+#else
   itkTypeMacro(rtkADMMTotalVariationConjugateGradientOperator, ConjugateGradientOperator);
+#endif
 
   using BackProjectionFilterType = rtk::BackProjectionImageFilter<TOutputImage, TOutputImage>;
   using BackProjectionFilterPointer = typename BackProjectionFilterType::Pointer;

diff --git a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h
@@ -155,7 +155,11 @@ class ITK_TEMPLATE_EXPORT ADMMWaveletsConeBeamReconstructionFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ADMMWaveletsConeBeamReconstructionFilter);
+#else
   itkTypeMacro(ADMMWaveletsConeBeamReconstructionFilter, itk::ImageToImageFilter);
+#endif
 
   //    /** The 3D image to be updated */
   //    void SetInputVolume(const TOutputImage* Volume);

diff --git a/include/rtkADMMWaveletsConjugateGradientOperator.h b/include/rtkADMMWaveletsConjugateGradientOperator.h
@@ -109,7 +109,11 @@ class ITK_TEMPLATE_EXPORT ADMMWaveletsConjugateGradientOperator : public Conjuga
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(rtkADMMWaveletsConjugateGradientOperator);
+#else
   itkTypeMacro(rtkADMMWaveletsConjugateGradientOperator, ConjugateGradientOperator);
+#endif
 
   using BackProjectionFilterType = rtk::BackProjectionImageFilter<TOutputImage, TOutputImage>;
   using BackProjectionFilterPointer = typename BackProjectionFilterType::Pointer;

diff --git a/include/rtkAddMatrixAndDiagonalImageFilter.h b/include/rtkAddMatrixAndDiagonalImageFilter.h
@@ -55,7 +55,11 @@ class ITK_TEMPLATE_EXPORT AddMatrixAndDiagonalImageFilter : public itk::ImageToI
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(AddMatrixAndDiagonalImageFilter);
+#else
   itkTypeMacro(AddMatrixAndDiagonalImageFilter, itk::ImageToImageFilter);
+#endif
 
   /** Convenient parameters extracted from template types */
   static constexpr unsigned int nChannels = TDiagonal::PixelType::Dimension;

diff --git a/include/rtkAdditiveGaussianNoiseImageFilter.h b/include/rtkAdditiveGaussianNoiseImageFilter.h
@@ -183,7 +183,11 @@ class ITK_TEMPLATE_EXPORT AdditiveGaussianNoiseImageFilter : public itk::ImageTo
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(AdditiveGaussianNoiseImageFilter);
+#else
   itkTypeMacro(AdditiveGaussianNoiseImageFilter, ImageToImageFilter);
+#endif
 
   /** Superclass type alias. */
   using OutputImageRegionType = typename Superclass::OutputImageRegionType;

diff --git a/include/rtkAmsterdamShroudImageFilter.h b/include/rtkAmsterdamShroudImageFilter.h
@@ -125,7 +125,11 @@ class ITK_TEMPLATE_EXPORT AmsterdamShroudImageFilter
   itkSetMacro(Corner2, PointType);
 
   /** Runtime information support. */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(AmsterdamShroudImageFilter);
+#else
   itkTypeMacro(AmsterdamShroudImageFilter, itk::ImageToImageFilter);
+#endif
 
 protected:
   AmsterdamShroudImageFilter();

diff --git a/include/rtkAverageOutOfROIImageFilter.h b/include/rtkAverageOutOfROIImageFilter.h
@@ -64,7 +64,11 @@ class ITK_TEMPLATE_EXPORT AverageOutOfROIImageFilter : public itk::InPlaceImageF
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(AverageOutOfROIImageFilter);
+#else
   itkTypeMacro(AverageOutOfROIImageFilter, itk::InPlaceImageFilter);
+#endif
 
   /** The image containing the weights applied to the temporal components */
   void

diff --git a/include/rtkBackProjectionImageFilter.h b/include/rtkBackProjectionImageFilter.h
@@ -71,7 +71,11 @@ class ITK_TEMPLATE_EXPORT BackProjectionImageFilter : public itk::InPlaceImageFi
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(BackProjectionImageFilter);
+#else
   itkTypeMacro(BackProjectionImageFilter, itk::ImageToImageFilter);
+#endif
 
   /** Get / Set the object pointer to projection geometry */
   itkGetConstObjectMacro(Geometry, GeometryType);

diff --git a/include/rtkBackwardDifferenceDivergenceImageFilter.h b/include/rtkBackwardDifferenceDivergenceImageFilter.h
@@ -59,7 +59,11 @@ class ITK_TEMPLATE_EXPORT BackwardDifferenceDivergenceImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(BackwardDifferenceDivergenceImageFilter);
+#else
   itkTypeMacro(BackwardDifferenceDivergenceImageFilter, ImageToImageFilter);
+#endif
 
   /** Use the image spacing information in calculations. Use this option if you
    *  want derivatives in physical space. Default is UseImageSpacingOn. */

diff --git a/include/rtkBioscanGeometryReader.h b/include/rtkBioscanGeometryReader.h
@@ -64,7 +64,11 @@ class RTK_EXPORT BioscanGeometryReader : public itk::LightProcessObject
   using GeometryPointer = GeometryType::Pointer;
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(BioscanGeometryReader);
+#else
   itkTypeMacro(BioscanGeometryReader, itk::LightProcessObject);
+#endif
 
   /** Method for creation through the object factory. */
   itkNewMacro(Self);

diff --git a/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h b/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h
@@ -51,7 +51,11 @@ class ITK_TEMPLATE_EXPORT BlockDiagonalMatrixVectorMultiplyImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(BlockDiagonalMatrixVectorMultiplyImageFilter);
+#else
   itkTypeMacro(BlockDiagonalMatrixVectorMultiplyImageFilter, itk::ImageToImageFilter);
+#endif
 
   /** Convenient parameters extracted from template types */
   static constexpr unsigned int nChannels = TVectorImage::PixelType::Dimension;

diff --git a/include/rtkBoellaardScatterCorrectionImageFilter.h b/include/rtkBoellaardScatterCorrectionImageFilter.h
@@ -58,7 +58,11 @@ class ITK_TEMPLATE_EXPORT BoellaardScatterCorrectionImageFilter
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(BoellaardScatterCorrectionImageFilter);
+#else
   itkTypeMacro(BoellaardScatterCorrectionImageFilter, itk::ImageToImageFilter);
+#endif
 
   /** Get / Set the air threshold on projection images. The threshold is used to
    ** evaluate which part of the x-rays have traversed the patient. */

diff --git a/include/rtkBoxShape.h b/include/rtkBoxShape.h
@@ -62,7 +62,11 @@ class RTK_EXPORT BoxShape : public ConvexShape
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(BoxShape);
+#else
   itkTypeMacro(BoxShape, ConvexShape);
+#endif
 
   /** See rtk::ConvexShape::IsInside. */
   bool

diff --git a/include/rtkConditionalMedianImageFilter.h b/include/rtkConditionalMedianImageFilter.h
@@ -61,7 +61,11 @@ class ITK_TEMPLATE_EXPORT ConditionalMedianImageFilter : public itk::InPlaceImag
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ConditionalMedianImageFilter);
+#else
   itkTypeMacro(ConditionalMedianImageFilter, itk::InPlaceImageFilter);
+#endif
 
   /** Set/Get neighborhood radius */
   itkSetMacro(Radius, MedianRadiusType);

diff --git a/include/rtkConjugateGradientConeBeamReconstructionFilter.h b/include/rtkConjugateGradientConeBeamReconstructionFilter.h
@@ -122,7 +122,11 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientConeBeamReconstructionFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ConjugateGradientConeBeamReconstructionFilter);
+#else
   itkTypeMacro(ConjugateGradientConeBeamReconstructionFilter, itk::ImageToImageFilter);
+#endif
 
   /** Setters for the inputs */
   void

diff --git a/include/rtkConjugateGradientImageFilter.h b/include/rtkConjugateGradientImageFilter.h
@@ -61,7 +61,11 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ConjugateGradientImageFilter);
+#else
   itkTypeMacro(ConjugateGradientImageFilter, itk::InPlaceImageFilter);
+#endif
 
   /** Get and Set macro*/
   itkGetMacro(NumberOfIterations, int);

diff --git a/include/rtkConjugateGradientOperator.h b/include/rtkConjugateGradientOperator.h
@@ -43,7 +43,11 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientOperator : public itk::ImageToImageFi
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ConjugateGradientOperator);
+#else
   itkTypeMacro(ConjugateGradientOperator, itk::ImageToImageFilter);
+#endif
 
   /** The image to be updated.*/
   virtual void

diff --git a/include/rtkConstantImageSource.h b/include/rtkConstantImageSource.h
@@ -69,7 +69,11 @@ class ITK_TEMPLATE_EXPORT ConstantImageSource : public itk::ImageSource<TOutputI
   using OutputImageRegionType = typename TOutputImage::RegionType;
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ConstantImageSource);
+#else
   itkTypeMacro(ConstantImageSource, itk::ImageSource);
+#endif
 
   /** Method for creation through the object factory. */
   itkNewMacro(Self);

diff --git a/include/rtkConvexShape.h b/include/rtkConvexShape.h
@@ -65,7 +65,11 @@ class RTK_EXPORT ConvexShape : public itk::DataObject
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(ConvexShape);
+#else
   itkTypeMacro(ConvexShape, itk::DataObject);
+#endif
 
   /** Returns true if a point is inside the object. */
   virtual bool

diff --git a/include/rtkCudaAverageOutOfROIImageFilter.h b/include/rtkCudaAverageOutOfROIImageFilter.h
@@ -59,7 +59,11 @@ class RTK_EXPORT CudaAverageOutOfROIImageFilter
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaAverageOutOfROIImageFilter);
+#  else
   itkTypeMacro(CudaAverageOutOfROIImageFilter, AverageOutOfROIImageFilter);
+#  endif
 
 protected:
   CudaAverageOutOfROIImageFilter();

diff --git a/include/rtkCudaBackProjectionImageFilter.h b/include/rtkCudaBackProjectionImageFilter.h
@@ -68,7 +68,11 @@ class ITK_TEMPLATE_EXPORT CudaBackProjectionImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaBackProjectionImageFilter);
+#  else
   itkTypeMacro(CudaBackProjectionImageFilter, Superclass);
+#  endif
 
 protected:
   CudaBackProjectionImageFilter();

diff --git a/include/rtkCudaConjugateGradientImageFilter.h b/include/rtkCudaConjugateGradientImageFilter.h
@@ -57,7 +57,11 @@ class ITK_TEMPLATE_EXPORT CudaConjugateGradientImageFilter
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaConjugateGradientImageFilter);
+#  else
   itkTypeMacro(CudaConjugateGradientImageFilter, ConjugateGradientImageFilter);
+#  endif
 
 protected:
   CudaConjugateGradientImageFilter();

diff --git a/include/rtkCudaConstantVolumeSeriesSource.h b/include/rtkCudaConstantVolumeSeriesSource.h
@@ -59,7 +59,11 @@ class RTK_EXPORT CudaConstantVolumeSeriesSource
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaConstantVolumeSeriesSource);
+#  else
   itkTypeMacro(CudaConstantVolumeSeriesSource, ImageToImageFilter);
+#  endif
 
 protected:
   CudaConstantVolumeSeriesSource();

diff --git a/include/rtkCudaConstantVolumeSource.h b/include/rtkCudaConstantVolumeSource.h
@@ -59,7 +59,11 @@ class RTK_EXPORT CudaConstantVolumeSource
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaConstantVolumeSource);
+#  else
   itkTypeMacro(CudaConstantVolumeSource, ImageToImageFilter);
+#  endif
 
 protected:
   CudaConstantVolumeSource();

diff --git a/include/rtkCudaCropImageFilter.h b/include/rtkCudaCropImageFilter.h
@@ -65,7 +65,11 @@ class RTK_EXPORT CudaCropImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaCropImageFilter);
+#  else
   itkTypeMacro(CudaCropImageFilter, ImageToImageFilter);
+#  endif
 
 protected:
   CudaCropImageFilter();

diff --git a/include/rtkCudaCyclicDeformationImageFilter.h b/include/rtkCudaCyclicDeformationImageFilter.h
@@ -62,7 +62,11 @@ class RTK_EXPORT CudaCyclicDeformationImageFilter
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaCyclicDeformationImageFilter);
+#  else
   itkTypeMacro(CudaCyclicDeformationImageFilter, CyclicDeformationImageFilter);
+#  endif
 
 protected:
   CudaCyclicDeformationImageFilter();

diff --git a/include/rtkCudaDisplacedDetectorImageFilter.h b/include/rtkCudaDisplacedDetectorImageFilter.h
@@ -68,7 +68,11 @@ class RTK_EXPORT CudaDisplacedDetectorImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaDisplacedDetectorImageFilter);
+#  else
   itkTypeMacro(CudaDisplacedDetectorImageFilter, itk::CudaInPlaceImageFilter);
+#  endif
 
 protected:
   /** Standard constructor **/

diff --git a/include/rtkCudaFDKBackProjectionImageFilter.h b/include/rtkCudaFDKBackProjectionImageFilter.h
@@ -67,7 +67,11 @@ class RTK_EXPORT CudaFDKBackProjectionImageFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaFDKBackProjectionImageFilter);
+#  else
   itkTypeMacro(CudaFDKBackProjectionImageFilter, Superclass);
+#  endif
 
 protected:
   CudaFDKBackProjectionImageFilter();

diff --git a/include/rtkCudaFDKConeBeamReconstructionFilter.h b/include/rtkCudaFDKConeBeamReconstructionFilter.h
@@ -70,7 +70,11 @@ class RTK_EXPORT CudaFDKConeBeamReconstructionFilter
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaFDKConeBeamReconstructionFilter);
+#  else
   itkTypeMacro(CudaFDKConeBeamReconstructionFilter, FDKConeBeamReconstructionFilter);
+#  endif
 
 protected:
   CudaFDKConeBeamReconstructionFilter();

diff --git a/include/rtkCudaFDKWeightProjectionFilter.h b/include/rtkCudaFDKWeightProjectionFilter.h
@@ -69,7 +69,11 @@ class RTK_EXPORT CudaFDKWeightProjectionFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaFDKWeightProjectionFilter);
+#  else
   itkTypeMacro(CudaFDKWeightProjectionFilter, itk::CudaInPlaceImageFilter);
+#  endif
 
 protected:
   /** Standard constructor **/

diff --git a/include/rtkCudaFFTProjectionsConvolutionImageFilter.h b/include/rtkCudaFFTProjectionsConvolutionImageFilter.h
@@ -66,7 +66,11 @@ class ITK_TEMPLATE_EXPORT CudaFFTProjectionsConvolutionImageFilter
   using CudaFFTOutputImagePointer = CudaFFTOutputImageType::Pointer;
 
   /** Runtime information support. */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaFFTProjectionsConvolutionImageFilter);
+#  else
   itkTypeMacro(CudaFFTProjectionsConvolutionImageFilter, TParentImageFilter);
+#  endif
 
 protected:
   CudaFFTProjectionsConvolutionImageFilter();

diff --git a/include/rtkCudaFFTRampImageFilter.h b/include/rtkCudaFFTRampImageFilter.h
@@ -56,7 +56,11 @@ class RTK_EXPORT CudaFFTRampImageFilter
   itkNewMacro(Self);
 
   /** Runtime information support. */
+#  ifdef itkOverrideGetNameOfClassMacro
+  itkOverrideGetNameOfClassMacro(CudaFFTRampImageFilter);
+#  else
   itkTypeMacro(CudaFFTRampImageFilter, FFTRampImageFilter);
+#  endif
 
 protected:
   CudaFFTRampImageFilter() {}