COMP: Use modern macro for name of class

hjmjohnson · hjmjohnson · commit 9c204f898636 · 2025-01-25T11:17:36.000-06:00
When preparing for the future with ITK by setting
ITK_FUTURE_LEGACY_REMOVE:BOOL=ON
ITK_LEGACY_REMOVEBOOL=ON

The future preferred macro should be used
│ -  itkTypeMacro
│ +  itkOverrideGetNameOfClassMacro
diff --git a/include/itkCellAreaTriangleCellSubdivisionCriterion.h b/include/itkCellAreaTriangleCellSubdivisionCriterion.h
@@ -61,7 +61,7 @@ class CellAreaTriangleCellSubdivisionCriterion : public QuadEdgeMeshSubdivisionC
   using SubdivisionCellContainer = typename Superclass::SubdivisionCellContainer;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(CellAreaTriangleCellSubdivisionCriterion, QuadEdgeMeshTriangleCellSubdivisionCriterion);
+   itkOverrideGetNameOfClassMacro(CellAreaTriangleCellSubdivisionCriterion);
   itkNewMacro(Self);
 
   void
diff --git a/include/itkConditionalSubdivisionQuadEdgeMeshFilter.h b/include/itkConditionalSubdivisionQuadEdgeMeshFilter.h
@@ -58,7 +58,7 @@ class ConditionalSubdivisionQuadEdgeMeshFilter
   using CriterionPointer = typename CriterionType::Pointer;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(ConditionalSubdivisionQuadEdgeMeshFilter, QuadEdgeMeshToQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(ConditionalSubdivisionQuadEdgeMeshFilter);
   itkNewMacro(Self);
 
 #ifdef ITK_USE_CONCEPT_CHECKING
diff --git a/include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.h b/include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.h
@@ -60,7 +60,7 @@ class EdgeLengthTriangleEdgeCellSubdivisionCriterion : public QuadEdgeMeshSubdiv
   using SubdivisionCellContainer = typename Superclass::SubdivisionCellContainer;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(EdgeLengthTriangleEdgeCellSubdivisionCriterion, QuadEdgeMeshSubdivisionCriterion);
+   itkOverrideGetNameOfClassMacro(EdgeLengthTriangleEdgeCellSubdivisionCriterion);
   itkNewMacro(Self);
 
   void
diff --git a/include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.h
@@ -59,7 +59,7 @@ class IterativeTriangleCellSubdivisionQuadEdgeMeshFilter
     typename CellSubdivisionFilterType::SubdivisionCellContainerConstIterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(IterativeTriangleCellSubdivisionQuadEdgeMeshFilter, QuadEdgeMeshToQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(IterativeTriangleCellSubdivisionQuadEdgeMeshFilter);
   itkNewMacro(Self);
 
 #ifdef ITK_USE_CONCEPT_CHECKING
diff --git a/include/itkLinearTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLinearTriangleCellSubdivisionQuadEdgeMeshFilter.h
@@ -78,7 +78,7 @@ class LinearTriangleCellSubdivisionQuadEdgeMeshFilter
   using EdgePointIdentifierContainerConstIterator = typename Superclass::EdgePointIdentifierContainerConstIterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(LinearTriangleCellSubdivisionQuadEdgeMeshFilter, TriangleCellSubdivisionQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(LinearTriangleCellSubdivisionQuadEdgeMeshFilter);
 
   /** New macro for creation of through a Smart Pointer   */
   itkNewMacro(Self);
diff --git a/include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
@@ -76,7 +76,7 @@ class LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter
   using OutputPointIdIterator = typename Superclass::OutputPointIdIterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter, TriangleEdgeCellSubdivisionQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter);
 
   /** New macro for creation of through a Smart Pointer   */
   itkNewMacro(Self);
diff --git a/include/itkLoopTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLoopTriangleCellSubdivisionQuadEdgeMeshFilter.h
@@ -103,7 +103,7 @@ class LoopTriangleCellSubdivisionQuadEdgeMeshFilter
   using EdgePointIdentifierContainerConstIterator = typename Superclass::EdgePointIdentifierContainerConstIterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(LoopTriangleCellSubdivisionQuadEdgeMeshFilter, TriangleCellSubdivisionQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(LoopTriangleCellSubdivisionQuadEdgeMeshFilter);
 
   /** New macro for creation of through a Smart Pointer   */
   itkNewMacro(Self);
diff --git a/include/itkLoopTriangleCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkLoopTriangleCellSubdivisionQuadEdgeMeshFilter.hxx
@@ -276,7 +276,6 @@ LoopTriangleCellSubdivisionQuadEdgeMeshFilter<TInputMesh, TOutputMesh>::Smoothin
       opt[kk] = (1.0 - nn * beta) * ipt[kk] + beta * opt[kk];
     }
   }
-
   return opt;
 }
 } // namespace itk
diff --git a/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
@@ -76,7 +76,7 @@ class LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter
   using OutputPointIdIterator = typename Superclass::OutputPointIdIterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter, TriangleEdgeCellSubdivisionQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter);
 
   /** New macro for creation of through a Smart Pointer   */
   itkNewMacro(Self);
diff --git a/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.hxx
@@ -97,7 +97,6 @@ LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter<TInputMesh, TOutputMesh>::AddN
   {
     itkExceptionMacro(<< "Wire edge detected");
   }
-
   return;
 }
 
diff --git a/include/itkModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter.h
@@ -79,7 +79,7 @@ class ModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter
   using EdgePointIdentifierContainerConstIterator = typename Superclass::EdgePointIdentifierContainerConstIterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(ModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter, TriangleCellSubdivisionQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(ModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter);
 
   /** New macro for creation of through a Smart Pointer   */
   itkNewMacro(Self);
diff --git a/include/itkQuadEdgeMeshSubdivisionCriterion.h b/include/itkQuadEdgeMeshSubdivisionCriterion.h
@@ -57,7 +57,7 @@ class ITK_EXPORT QuadEdgeMeshSubdivisionCriterion : public Object
   using SubdivisionCellContainer = typename TCellSubdivisionFilter::SubdivisionCellContainer;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(QuadEdgeMeshSubdivisionCriterion, Object);
+   itkOverrideGetNameOfClassMacro(QuadEdgeMeshSubdivisionCriterion);
 
   virtual void
   Compute(MeshType * mesh, SubdivisionCellContainer & edgeList) = 0;
diff --git a/include/itkSquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkSquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter.h
@@ -82,7 +82,7 @@ class SquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter
   using EdgePointIdentifierContainerConstIterator = typename Superclass::EdgePointIdentifierContainerConstIterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(SquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter, TriangleCellSubdivisionQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(SquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter);
 
   /** New macro for creation of through a Smart Pointer   */
   itkNewMacro(Self);
diff --git a/include/itkSubdivisionQuadEdgeMeshFilter.h b/include/itkSubdivisionQuadEdgeMeshFilter.h
@@ -90,7 +90,7 @@ class SubdivisionQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMeshFilter<TI
   using EdgePointIdentifierContainerConstIterator = typename EdgePointIdentifierContainer::ConstIterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(SubdivisionQuadEdgeMeshFilter, QuadEdgeMeshToQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(SubdivisionQuadEdgeMeshFilter);
 
 protected:
   SubdivisionQuadEdgeMeshFilter();
diff --git a/include/itkTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkTriangleCellSubdivisionQuadEdgeMeshFilter.h
@@ -87,7 +87,7 @@ class TriangleCellSubdivisionQuadEdgeMeshFilter : public SubdivisionQuadEdgeMesh
   using SubdivisionCellContainerConstIterator = typename SubdivisionCellContainer::const_iterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(TriangleCellSubdivisionQuadEdgeMeshFilter, SubdivisionQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(TriangleCellSubdivisionQuadEdgeMeshFilter);
   itkGetConstReferenceMacro(CellsToBeSubdivided, SubdivisionCellContainer);
 
   void
diff --git a/include/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
@@ -82,7 +82,7 @@ class TriangleEdgeCellSubdivisionQuadEdgeMeshFilter
   using SubdivisionCellContainerConstIterator = typename SubdivisionCellContainer::const_iterator;
 
   /** Run-time type information (and related methods).   */
-  itkTypeMacro(TriangleEdgeCellSubdivisionQuadEdgeMeshFilter, TriangleCellSubdivisionQuadEdgeMeshFilter);
+   itkOverrideGetNameOfClassMacro(TriangleEdgeCellSubdivisionQuadEdgeMeshFilter);
   itkGetConstReferenceMacro(EdgesToBeSubdivided, SubdivisionCellContainer);
 
   void
diff --git a/test/itkCriterionTriangleCellSubdivisionQuadEdgeMeshFilterTest.cxx b/test/itkCriterionTriangleCellSubdivisionQuadEdgeMeshFilterTest.cxx
@@ -178,6 +178,5 @@ itkCriterionTriangleCellSubdivisionQuadEdgeMeshFilterTest(int argc, char * argv[
     std::cerr << "You must have subdivision type " << std::endl;
     return EXIT_FAILURE;
   }
-
   return EXIT_SUCCESS;
 }
diff --git a/test/itkCriterionTriangleEdgeCellSubdivisionQuadEdgeMeshFilterTest.cxx b/test/itkCriterionTriangleEdgeCellSubdivisionQuadEdgeMeshFilterTest.cxx
@@ -166,6 +166,5 @@ itkCriterionTriangleEdgeCellSubdivisionQuadEdgeMeshFilterTest(int argc, char * a
     std::cerr << "You must have subdivision type " << std::endl;
     return EXIT_FAILURE;
   }
-
   return EXIT_SUCCESS;
 }
diff --git a/test/itkTriangleCellSubdivisionQuadEdgeMeshFilterTest.cxx b/test/itkTriangleCellSubdivisionQuadEdgeMeshFilterTest.cxx
@@ -210,6 +210,5 @@ itkTriangleCellSubdivisionQuadEdgeMeshFilterTest(int argc, char * argv[])
     std::cerr << "You must have subdivision type " << std::endl;
     return EXIT_FAILURE;
   }
-
   return EXIT_SUCCESS;
 }
diff --git a/test/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilterTest.cxx b/test/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilterTest.cxx
@@ -174,6 +174,5 @@ itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilterTest(int argc, char * argv[])
     std::cerr << "You must have subdivision type " << std::endl;
     return EXIT_FAILURE;
   }
-
   return EXIT_SUCCESS;
 }

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,6 @@ LoopTriangleCellSubdivisionQuadEdgeMeshFilter<TInputMesh, TOutputMesh>::Smoothin`
`276`	`276`	`opt[kk] = (1.0 - nn * beta) * ipt[kk] + beta * opt[kk];`
`277`	`277`	`}`
`278`	`278`	`}`
`279`		`-`
`280`	`279`	`return opt;`
`281`	`280`	`}`
`282`	`281`	`} // namespace itk`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter<TInputMesh, TOutputMesh>::AddN`
`97`	`97`	`{`
`98`	`98`	`itkExceptionMacro(<< "Wire edge detected");`
`99`	`99`	`}`
`100`		`-`
`101`	`100`	`return;`
`102`	`101`	`}`
`103`	`102`