Merge pull request #1832 from ANTsX/update-to-new-macros

STYLE: Add itkVirtualGetNameOfClassMacro + itkOverrideGetNameOfClassMacro

Author: ntustison

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);
 
 
   /**

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

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;

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);

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;
 

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;
 

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;

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;

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;

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;