From 9269414dcb44bb358286107b11109fde3ea674d6 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Fri, 20 Sep 2024 16:43:26 +0200 Subject: [PATCH] STYLE: Remove IdentifierType template argument from VectorContainer uses The index type (`ElementIdentifier`) of `itk::VectorContainer` is already `itk::SizeValueType` by default, and `itk::IdentifierType` is just an alias of `itk::SizeValueType`. --- Modules/Core/Mesh/include/itkMesh.h | 2 +- Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h | 2 +- Modules/Core/SpatialObjects/include/itkContourSpatialObject.h | 2 +- Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.h | 2 +- Modules/Core/SpatialObjects/include/itkEllipseSpatialObject.h | 2 +- Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.h | 2 +- Modules/Core/SpatialObjects/include/itkLineSpatialObject.h | 2 +- Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h | 2 +- Modules/Core/SpatialObjects/include/itkSpatialObject.h | 2 +- Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.h | 2 +- Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h | 2 +- .../include/itkFastMarchingExtensionImageFilterBase.h | 2 +- Modules/Filtering/FastMarching/include/itkFastMarchingTraits.h | 2 +- Modules/Registration/Common/include/itkPointsLocator.h | 2 +- .../Metricsv4/test/itkEuclideanDistancePointSetMetricTest3.cxx | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Modules/Core/Mesh/include/itkMesh.h b/Modules/Core/Mesh/include/itkMesh.h index 03580acfbdf..cb6949b903c 100644 --- a/Modules/Core/Mesh/include/itkMesh.h +++ b/Modules/Core/Mesh/include/itkMesh.h @@ -184,7 +184,7 @@ class ITK_TEMPLATE_EXPORT Mesh : public PointSet; + using CellsVectorContainer = typename itk::VectorContainer; using CellsVectorContainerPointer = typename CellsVectorContainer::Pointer; /** Used to support geometric operations on the toolkit. */ diff --git a/Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h b/Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h index 52bbd02dedd..cc2f36b0851 100644 --- a/Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h @@ -64,7 +64,7 @@ class ITK_TEMPLATE_EXPORT BlobSpatialObject : public PointBasedSpatialObject; + using PointContainerType = VectorContainer; using PointContainerPointer = SmartPointer; /** Method for creation through the object factory. */ diff --git a/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h b/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h index 50e71dea7de..938cad41022 100644 --- a/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h @@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT ContourSpatialObject using typename Superclass::PointType; using typename Superclass::TransformType; using typename Superclass::BoundingBoxType; - using PointContainerType = VectorContainer; + using PointContainerType = VectorContainer; using PointContainerPointer = SmartPointer; using InterpolationMethodEnum = ContourSpatialObjectEnums::InterpolationMethod; diff --git a/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.h b/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.h index f8bc695f84b..d8e87b7c69f 100644 --- a/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.h @@ -56,7 +56,7 @@ class ITK_TEMPLATE_EXPORT DTITubeSpatialObject using typename Superclass::PointType; using typename Superclass::TransformType; using typename Superclass::SpatialObjectPointType; - using PointContainerType = VectorContainer; + using PointContainerType = VectorContainer; using PointContainerPointer = SmartPointer; using typename Superclass::VectorType; using typename Superclass::CovariantVectorType; diff --git a/Modules/Core/SpatialObjects/include/itkEllipseSpatialObject.h b/Modules/Core/SpatialObjects/include/itkEllipseSpatialObject.h index 66ce1ac5fa9..32c8eb9e810 100644 --- a/Modules/Core/SpatialObjects/include/itkEllipseSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkEllipseSpatialObject.h @@ -49,7 +49,7 @@ class ITK_TEMPLATE_EXPORT EllipseSpatialObject : public SpatialObject; + using PointContainerType = VectorContainer; using PointContainerPointer = SmartPointer; using ArrayType = FixedArray; diff --git a/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.h b/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.h index 482068bbc1b..eaaad34606a 100644 --- a/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.h @@ -54,7 +54,7 @@ class ITK_TEMPLATE_EXPORT LandmarkSpatialObject : public PointBasedSpatialObject using typename Superclass::PointType; using typename Superclass::TransformType; using typename Superclass::BoundingBoxType; - using PointContainerType = VectorContainer; + using PointContainerType = VectorContainer; using PointContainerPointer = SmartPointer; /** Method for creation through the object factory. */ diff --git a/Modules/Core/SpatialObjects/include/itkLineSpatialObject.h b/Modules/Core/SpatialObjects/include/itkLineSpatialObject.h index bc141475332..cedf327e75e 100644 --- a/Modules/Core/SpatialObjects/include/itkLineSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkLineSpatialObject.h @@ -60,7 +60,7 @@ class ITK_TEMPLATE_EXPORT LineSpatialObject using typename Superclass::PointType; using typename Superclass::TransformType; using typename Superclass::BoundingBoxType; - using PointContainerType = VectorContainer; + using PointContainerType = VectorContainer; using PointContainerPointer = SmartPointer; /** Method for creation through the object factory. */ diff --git a/Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h b/Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h index 02074d28481..1ccef3fea64 100644 --- a/Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h @@ -53,7 +53,7 @@ class ITK_TEMPLATE_EXPORT MeshSpatialObject : public SpatialObject; + using PointContainerType = VectorContainer; using PointContainerPointer = typename PointContainerType::Pointer; /** Method for creation through the object factory. */ diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObject.h b/Modules/Core/SpatialObjects/include/itkSpatialObject.h index 54e832900fd..050bfaf498b 100644 --- a/Modules/Core/SpatialObjects/include/itkSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkSpatialObject.h @@ -101,7 +101,7 @@ class ITK_TEMPLATE_EXPORT SpatialObject : public DataObject using TransformPointer = typename TransformType::Pointer; using TransformConstPointer = const TransformType *; - using VectorContainerType = VectorContainer; + using VectorContainerType = VectorContainer; using BoundingBoxType = BoundingBox; using BoundingBoxPointer = typename BoundingBoxType::Pointer; diff --git a/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.h b/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.h index aed0e55e249..b98015ca848 100644 --- a/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.h @@ -58,7 +58,7 @@ class ITK_TEMPLATE_EXPORT SurfaceSpatialObject using typename Superclass::BoundingBoxType; using typename Superclass::CovariantVectorType; - using PointContainerType = VectorContainer; + using PointContainerType = VectorContainer; using PointContainerPointer = SmartPointer; /** Method for creation through the object factory. */ diff --git a/Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h b/Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h index b4e12692e1a..fe5a1af6c6b 100644 --- a/Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h @@ -57,7 +57,7 @@ class ITK_TEMPLATE_EXPORT TubeSpatialObject : public PointBasedSpatialObject; + using PointContainerType = VectorContainer; using PointContainerPointer = SmartPointer; using typename Superclass::VectorType; using typename Superclass::CovariantVectorType; diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilterBase.h b/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilterBase.h index 187bb5907ce..4615ddf027b 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilterBase.h +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilterBase.h @@ -82,7 +82,7 @@ class ITK_TEMPLATE_EXPORT FastMarchingExtensionImageFilterBase : public FastMarc /** AuxVarType type alias support */ using AuxValueType = TAuxValue; using AuxValueVectorType = Vector; - using AuxValueContainerType = VectorContainer; + using AuxValueContainerType = VectorContainer; using AuxValueContainerPointer = typename AuxValueContainerType::Pointer; using AuxValueContainerConstIterator = typename AuxValueContainerType::ConstIterator; diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingTraits.h b/Modules/Filtering/FastMarching/include/itkFastMarchingTraits.h index 812f7244a63..a0f61df8876 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingTraits.h +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingTraits.h @@ -60,7 +60,7 @@ class FastMarchingTraitsBase using OutputPixelType = typename OutputDomainType::PixelType; using NodePairType = NodePair; - using NodePairContainerType = VectorContainer; + using NodePairContainerType = VectorContainer; using NodePairContainerPointer = typename NodePairContainerType::Pointer; using NodePairContainerIterator = typename NodePairContainerType::Iterator; using NodePairContainerConstIterator = typename NodePairContainerType::ConstIterator; diff --git a/Modules/Registration/Common/include/itkPointsLocator.h b/Modules/Registration/Common/include/itkPointsLocator.h index f8bcdd0c6a8..21bddb0bb5e 100644 --- a/Modules/Registration/Common/include/itkPointsLocator.h +++ b/Modules/Registration/Common/include/itkPointsLocator.h @@ -38,7 +38,7 @@ namespace itk * * \ingroup ITKRegistrationCommon */ -template >> +template >> class ITK_TEMPLATE_EXPORT PointsLocator : public Object { public: diff --git a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricTest3.cxx b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricTest3.cxx index 6314c5c27e3..11cf49a3ae5 100644 --- a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricTest3.cxx +++ b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricTest3.cxx @@ -34,7 +34,7 @@ itkEuclideanDistancePointSetMetricTest3Run(double distanceThreshold) using PointSetType = itk::PointSet; using PointType = typename PointSetType::PointType; using IdentifierType = itk::IdentifierType; - using PointsContainerType = itk::VectorContainer; + using PointsContainerType = itk::VectorContainer; using PointsLocatorType = itk::PointsLocator; auto pointsLocator = PointsLocatorType::New();