From 8ac75d572c3769aa2f41b31e0be86023e804cdf6 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Wed, 27 Nov 2024 20:45:27 +0100 Subject: [PATCH] ENH: Deprecate (FUTURE_REMOVE) CoordRepType in favor of CoordinateType MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Deprecated using `CoordRepType`, as was suggested by Dženan Zukić. --- Modules/Core/Common/include/itkBoundingBox.h | 5 ++++- Modules/Core/Common/include/itkCellInterface.h | 10 ++++++++-- Modules/Core/Common/include/itkContinuousIndex.h | 5 ++++- .../Core/Common/include/itkDefaultDynamicMeshTraits.h | 5 ++++- .../Core/Common/include/itkDefaultStaticMeshTraits.h | 5 ++++- Modules/Core/Common/include/itkPoint.h | 5 ++++- Modules/Core/Common/include/itkPointSetBase.h | 5 ++++- Modules/Core/Common/include/itkTriangleHelper.h | 5 ++++- Modules/Core/ImageFunction/include/itkImageFunction.h | 5 ++++- .../include/itkVectorInterpolateImageFunction.h | 5 ++++- .../Core/Mesh/include/itkInteriorExteriorMeshFilter.h | 5 ++++- Modules/Core/Mesh/include/itkMesh.h | 5 ++++- .../include/itkParametricSpaceToImageSpaceMeshFilter.h | 5 ++++- Modules/Core/Mesh/include/itkTransformMeshFilter.h | 5 ++++- Modules/Core/Mesh/include/itkWarpMeshFilter.h | 5 ++++- .../QuadEdgeMesh/include/itkQuadEdgeCellTraitsInfo.h | 5 ++++- ...adEdgeMeshEulerOperatorCreateCenterVertexFunction.h | 5 ++++- .../include/itkQuadEdgeMeshEulerOperatorsTestHelper.h | 5 ++++- .../include/itkQuadEdgeMeshExtendedTraits.h | 5 ++++- .../include/itkQuadEdgeMeshFrontIterator.h | 5 ++++- .../Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h | 5 ++++- .../include/itkBSplineControlPointImageFunction.h | 5 ++++- .../Filtering/ImageGrid/include/itkExpandImageFilter.h | 5 ++++- .../Filtering/ImageGrid/include/itkWarpImageFilter.h | 5 ++++- .../ImageGrid/include/itkWarpVectorImageFilter.h | 5 ++++- .../include/itkVectorExpandImageFilter.h | 5 ++++- .../Review/include/itkConformalFlatteningMeshFilter.h | 5 ++++- .../Common/include/itkMeanSquareRegistrationFunction.h | 5 ++++- .../FEM/include/itkFEMRegistrationFilter.h | 5 ++++- .../FEM/include/itkMIRegistrationFunction.h | 5 ++++- .../FEM/include/itkNCCRegistrationFunction.h | 5 ++++- .../include/itkGPUDemonsRegistrationFunction.h | 5 ++++- .../include/itkManifoldParzenWindowsPointSetFunction.h | 5 ++++- .../Metricsv4/include/itkPointSetFunction.h | 5 ++++- .../include/itkPointSetToPointSetMetricWithIndexv4.h | 5 ++++- .../Metricsv4/include/itkPointSetToPointSetMetricv4.h | 5 ++++- .../include/itkDemonsRegistrationFunction.h | 5 ++++- .../include/itkESMDemonsRegistrationFunction.h | 5 ++++- .../itkFastSymmetricForcesDemonsRegistrationFunction.h | 5 ++++- .../include/itkLevelSetMotionRegistrationFunction.h | 5 ++++- .../itkSymmetricForcesDemonsRegistrationFunction.h | 5 ++++- .../include/itkShapeSignedDistanceFunction.h | 5 ++++- .../Segmentation/Voronoi/include/itkVoronoiDiagram2D.h | 5 ++++- .../Voronoi/include/itkVoronoiDiagram2DGenerator.h | 5 ++++- 44 files changed, 180 insertions(+), 45 deletions(-) diff --git a/Modules/Core/Common/include/itkBoundingBox.h b/Modules/Core/Common/include/itkBoundingBox.h index 4cb318d34e93..a9526d6b1c2b 100644 --- a/Modules/Core/Common/include/itkBoundingBox.h +++ b/Modules/Core/Common/include/itkBoundingBox.h @@ -90,7 +90,10 @@ class ITK_TEMPLATE_EXPORT BoundingBox : public Object /** Hold on to the type information specified by the template parameters. */ using PointIdentifier = TPointIdentifier; using CoordinateType = TCoordinate; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using PointsContainer = TPointsContainer; using PointsContainerPointer = typename PointsContainer::Pointer; using PointsContainerConstPointer = typename PointsContainer::ConstPointer; diff --git a/Modules/Core/Common/include/itkCellInterface.h b/Modules/Core/Common/include/itkCellInterface.h index b8240a0261cb..0226a056bfe2 100644 --- a/Modules/Core/Common/include/itkCellInterface.h +++ b/Modules/Core/Common/include/itkCellInterface.h @@ -110,7 +110,10 @@ class ITK_TEMPLATE_EXPORT CellInterface /** Save type information for this cell. */ using CoordinateType = typename CellTraits::CoordinateType; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolationWeightType = typename CellTraits::InterpolationWeightType; using PointIdentifier = typename CellTraits::PointIdentifier; using PointIdIterator = typename CellTraits::PointIdIterator; @@ -527,7 +530,10 @@ class ITK_TEMPLATE_EXPORT CellTraitsInfo public: static constexpr unsigned int PointDimension = VPointDimension; using CoordinateType = TCoordinate; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolationWeightType = TInterpolationWeight; using PointIdentifier = TPointIdentifier; using CellIdentifier = TCellIdentifier; diff --git a/Modules/Core/Common/include/itkContinuousIndex.h b/Modules/Core/Common/include/itkContinuousIndex.h index 9710c0cbe464..339c513046dd 100644 --- a/Modules/Core/Common/include/itkContinuousIndex.h +++ b/Modules/Core/Common/include/itkContinuousIndex.h @@ -57,7 +57,10 @@ class ITK_TEMPLATE_EXPORT ContinuousIndex : public Point::RealType; diff --git a/Modules/Core/Common/include/itkPointSetBase.h b/Modules/Core/Common/include/itkPointSetBase.h index 9e15509d6d1b..a3aad1b26888 100644 --- a/Modules/Core/Common/include/itkPointSetBase.h +++ b/Modules/Core/Common/include/itkPointSetBase.h @@ -72,7 +72,10 @@ class ITK_TEMPLATE_EXPORT PointSetBase : public DataObject /** Convenient type alias obtained from TPointsContainer template parameter. */ using PointType = typename TPointsContainer::Element; using CoordinateType = typename PointType::CoordinateType; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using PointIdentifier = typename TPointsContainer::ElementIdentifier; using PointsContainer = TPointsContainer; diff --git a/Modules/Core/Common/include/itkTriangleHelper.h b/Modules/Core/Common/include/itkTriangleHelper.h index 5d7b3dd06ff7..b371def7a174 100644 --- a/Modules/Core/Common/include/itkTriangleHelper.h +++ b/Modules/Core/Common/include/itkTriangleHelper.h @@ -34,7 +34,10 @@ class ITK_TEMPLATE_EXPORT TriangleHelper using Self = TriangleHelper; using PointType = TPoint; using CoordinateType = typename PointType::CoordinateType; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using VectorType = typename PointType::VectorType; using CrossVectorType = CrossHelper; diff --git a/Modules/Core/ImageFunction/include/itkImageFunction.h b/Modules/Core/ImageFunction/include/itkImageFunction.h index abb792c10888..c818b07b941b 100644 --- a/Modules/Core/ImageFunction/include/itkImageFunction.h +++ b/Modules/Core/ImageFunction/include/itkImageFunction.h @@ -85,7 +85,10 @@ class ITK_TEMPLATE_EXPORT ImageFunction : public FunctionBase oPt(iN * iN); for (unsigned int i = 0; i < iN; ++i) diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h index 621bb7fe0289..d3e5c8edce6b 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h @@ -71,7 +71,10 @@ class QuadEdgeMeshExtendedTraits using Self = QuadEdgeMeshExtendedTraits; /** Save the template parameters. */ using CoordinateType = TCoordinate; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using PixelType = TPixelType; using PrimalDataType = TPData; using DualDataType = TDData; diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h index 6363fa3b132c..c131469adb08 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h @@ -85,7 +85,10 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshFrontBaseIterator protected: // Mesh types using CoordinateType = typename MeshType::CoordinateType; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif // QE types using QEOriginType = typename QEType::OriginRefType; diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h index 1c63784ad4a2..7e0e990acad0 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h @@ -54,7 +54,10 @@ class QuadEdgeMeshTraits using PixelType = TPixel; using CellPixelType = TPixel; using CoordinateType = TCoordinate; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolationWeightType = TInterpolationWeight; static constexpr unsigned int PointDimension = VPointDimension; diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h index 7f0d58232e36..3a77f9650657 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h +++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h @@ -79,7 +79,10 @@ class ITK_TEMPLATE_EXPORT BSplineControlPointImageFunction using ControlPointLatticeType = TInputImage; using InputImageType = TInputImage; using CoordinateType = TCoordinate; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using PixelType = typename InputImageType::PixelType; using RegionType = typename InputImageType::RegionType; using IndexType = typename InputImageType::IndexType; diff --git a/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h b/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h index c95b4636fdff..568d1c323eef 100644 --- a/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h @@ -93,7 +93,10 @@ class ITK_TEMPLATE_EXPORT ExpandImageFilter : public ImageToImageFilter; using InterpolatorPointer = typename InterpolatorType::Pointer; using DefaultInterpolatorType = LinearInterpolateImageFunction; diff --git a/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h b/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h index c7dd4deaffaf..1397630db093 100644 --- a/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h @@ -129,7 +129,10 @@ class ITK_TEMPLATE_EXPORT WarpImageFilter : public ImageToImageFilter; using InterpolatorPointer = typename InterpolatorType::Pointer; using DefaultInterpolatorType = LinearInterpolateImageFunction; diff --git a/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h b/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h index e308a67f8dc6..298d62ac14c8 100644 --- a/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h @@ -132,7 +132,10 @@ class ITK_TEMPLATE_EXPORT WarpVectorImageFilter : public ImageToImageFilter; using InterpolatorPointer = typename InterpolatorType::Pointer; using DefaultInterpolatorType = VectorLinearInterpolateImageFunction; diff --git a/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h index 1520b842ded8..f3ff35f56784 100644 --- a/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h @@ -118,7 +118,10 @@ class ITK_TEMPLATE_EXPORT VectorExpandImageFilter : public ImageToImageFilter; using InterpolatorPointer = typename InterpolatorType::Pointer; using DefaultInterpolatorType = VectorLinearInterpolateImageFunction; diff --git a/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h b/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h index de583e6f67d9..ff34cb9ab31a 100644 --- a/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h +++ b/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h @@ -68,7 +68,10 @@ class ITK_TEMPLATE_EXPORT ConformalFlatteningMeshFilter : public MeshToMeshFilte /** Type for representing coordinates. */ // using CoordinateType = typename TInputMesh::CoordinateType; using CoordinateType = double; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h b/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h index bea6312ef447..23090f24b043 100644 --- a/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h +++ b/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h @@ -96,7 +96,10 @@ class ITK_TEMPLATE_EXPORT MeanSquareRegistrationFunction /** Interpolator type. */ using CoordinateType = double; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h index 53903b9f276d..4638e8bd1ebc 100644 --- a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h +++ b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h @@ -191,7 +191,10 @@ class ITK_TEMPLATE_EXPORT FEMRegistrationFilter : public ImageToImageFilter; using InterpolatorPointer = typename InterpolatorType::Pointer; diff --git a/Modules/Registration/FEM/include/itkMIRegistrationFunction.h b/Modules/Registration/FEM/include/itkMIRegistrationFunction.h index eacb275e95a3..1edeb4d33638 100644 --- a/Modules/Registration/FEM/include/itkMIRegistrationFunction.h +++ b/Modules/Registration/FEM/include/itkMIRegistrationFunction.h @@ -95,7 +95,10 @@ class ITK_TEMPLATE_EXPORT MIRegistrationFunction /** Interpolator type. */ using CoordinateType = double; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h b/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h index c63ed835fb3c..b01b5f4e929a 100644 --- a/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h +++ b/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h @@ -96,7 +96,10 @@ class ITK_TEMPLATE_EXPORT NCCRegistrationFunction /** Interpolator type. */ using CoordinateType = double; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h index 00de367afc6d..c68a07620c67 100644 --- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h +++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h @@ -99,7 +99,10 @@ class ITK_TEMPLATE_EXPORT GPUDemonsRegistrationFunction /** Interpolator type. */ using CoordinateType = double; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h b/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h index 401792ece22d..d014bc7413a9 100644 --- a/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h +++ b/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h @@ -73,7 +73,10 @@ class ITK_TEMPLATE_EXPORT ManifoldParzenWindowsPointSetFunction using RealType = TOutput; using OutputType = TOutput; using CoordinateType = TCoordinate; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif /** Typedef for points locator class to speed up finding neighboring points */ using PointsLocatorType = PointsLocator; diff --git a/Modules/Registration/Metricsv4/include/itkPointSetFunction.h b/Modules/Registration/Metricsv4/include/itkPointSetFunction.h index 67db33643af3..2bea651bf087 100644 --- a/Modules/Registration/Metricsv4/include/itkPointSetFunction.h +++ b/Modules/Registration/Metricsv4/include/itkPointSetFunction.h @@ -85,7 +85,10 @@ class ITK_TEMPLATE_EXPORT PointSetFunction : public FunctionBase; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h index 2116e66c890e..469dcc0c7a26 100644 --- a/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h +++ b/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h @@ -129,7 +129,10 @@ class ITK_TEMPLATE_EXPORT ESMDemonsRegistrationFunction /** Interpolator type. */ using CoordinateType = double; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h index 255491108970..578abc660201 100644 --- a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h +++ b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h @@ -89,7 +89,10 @@ class ITK_TEMPLATE_EXPORT FastSymmetricForcesDemonsRegistrationFunction /** Interpolator type. */ using CoordinateType = double; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h index 1d6daa1fc201..a11538e731c0 100644 --- a/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h +++ b/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h @@ -99,7 +99,10 @@ class ITK_TEMPLATE_EXPORT LevelSetMotionRegistrationFunction /** Interpolator type. */ using CoordinateType = double; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h index 01697c7bbd00..1681c42cc41a 100644 --- a/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h +++ b/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h @@ -104,7 +104,10 @@ class ITK_TEMPLATE_EXPORT SymmetricForcesDemonsRegistrationFunction /** Interpolator type. */ using CoordinateType = double; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h b/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h index 68dac7c72c23..d19cf0b86200 100644 --- a/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h +++ b/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h @@ -77,7 +77,10 @@ class ITK_TEMPLATE_EXPORT ShapeSignedDistanceFunction /** CoordRep type alias support */ using CoordinateType = TCoordinate; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif /** Point type alias support */ using PointType = InputType; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h index 9a72745cf423..846fc435d5b5 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h @@ -76,7 +76,10 @@ class ITK_TEMPLATE_EXPORT VoronoiDiagram2D /** Typedefs from itkMesh */ using PixelType = typename MeshTraits::PixelType; using CoordinateType = typename MeshTraits::CoordinateType; - using CoordRepType = CoordinateType; +#ifndef ITK_FUTURE_REMOVE_LEGACY + using CoordRepType [[deprecated("ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!")]] = + CoordinateType; +#endif using InterpolationWeightType = typename MeshTraits::InterpolationWeightType; using PointIdentifier = typename MeshTraits::PointIdentifier; using CellIdentifier = typename MeshTraits::CellIdentifier; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h index d415e436858c..36645c766ec7 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h @@ -73,7 +73,10 @@ class ITK_TEMPLATE_EXPORT VoronoiDiagram2DGenerator : public MeshSource