diff --git a/Modules/Core/ImageAdaptors/include/itkImageAdaptor.h b/Modules/Core/ImageAdaptors/include/itkImageAdaptor.h index 37bd325028e..8e8879244c1 100644 --- a/Modules/Core/ImageAdaptors/include/itkImageAdaptor.h +++ b/Modules/Core/ImageAdaptors/include/itkImageAdaptor.h @@ -271,8 +271,10 @@ class ITK_TEMPLATE_EXPORT ImageAdaptor : public ImageBase; using EdgeListType = std::list; - using EdgeListPointerType = EdgeListType *; - +#ifndef ITK_FUTURE_LEGACY_REMOVE + using EdgeListPointerType [[deprecated("Please just use `EdgeListType *` instead!")]] = EdgeListType *; +#endif using MeshClassCellsAllocationMethodEnum = itk::MeshEnums::MeshClassCellsAllocationMethod; /** Reserved PointIdentifier designated to represent the absence of Point */ diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshBoundaryEdgesMeshFunction.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshBoundaryEdgesMeshFunction.h index 72809b34829..49aeae3c3ff 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshBoundaryEdgesMeshFunction.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshBoundaryEdgesMeshFunction.h @@ -35,7 +35,7 @@ namespace itk */ template class ITK_TEMPLATE_EXPORT QuadEdgeMeshBoundaryEdgesMeshFunction - : public FunctionBase + : public FunctionBase { public: ITK_DISALLOW_COPY_AND_MOVE(QuadEdgeMeshBoundaryEdgesMeshFunction); @@ -44,7 +44,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshBoundaryEdgesMeshFunction using Self = QuadEdgeMeshBoundaryEdgesMeshFunction; using Pointer = SmartPointer; using ConstPointer = SmartPointer; - using Superclass = FunctionBase; + using Superclass = FunctionBase; // Types in superclass: using typename Superclass::InputType; diff --git a/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h b/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h index 30767ba890f..6268a644b6f 100644 --- a/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h @@ -104,7 +104,10 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianImageFilter : public ImageToImageFilte /** Typedef to describe the boundary condition. */ using BoundaryConditionType = ImageBoundaryCondition; - using InputBoundaryConditionPointerType = BoundaryConditionType *; +#ifndef ITK_FUTURE_LEGACY_REMOVE + using InputBoundaryConditionPointerType [[deprecated("Please just use `BoundaryConditionType *` instead!")]] = + BoundaryConditionType *; +#endif using InputDefaultBoundaryConditionType = ZeroFluxNeumannBoundaryCondition; using RealBoundaryConditionPointerType = ImageBoundaryCondition *; using RealDefaultBoundaryConditionType = ZeroFluxNeumannBoundaryCondition; @@ -147,8 +150,8 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianImageFilter : public ImageToImageFilte itkSetMacro(FilterDimensionality, unsigned int); /** Set/get the boundary condition. */ - itkSetMacro(InputBoundaryCondition, InputBoundaryConditionPointerType); - itkGetConstMacro(InputBoundaryCondition, InputBoundaryConditionPointerType); + itkSetMacro(InputBoundaryCondition, BoundaryConditionType *); + itkGetConstMacro(InputBoundaryCondition, BoundaryConditionType *); itkSetMacro(RealBoundaryCondition, RealBoundaryConditionPointerType); itkGetConstMacro(RealBoundaryCondition, RealBoundaryConditionPointerType); @@ -387,7 +390,7 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianImageFilter : public ImageToImageFilte /** Pointer to a persistent boundary condition object used ** for the image iterator. */ - InputBoundaryConditionPointerType m_InputBoundaryCondition{}; + BoundaryConditionType * m_InputBoundaryCondition{}; /** Default boundary condition */ InputDefaultBoundaryConditionType m_InputDefaultBoundaryCondition{}; diff --git a/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.h b/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.h index 8dcfd3dcc6d..0acd4f6ba21 100644 --- a/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.h @@ -124,7 +124,6 @@ class ITK_TEMPLATE_EXPORT FFTDiscreteGaussianImageFilter : public DiscreteGaussi /** Typedef to describe the boundary condition. */ using typename Superclass::BoundaryConditionType; - using typename Superclass::InputBoundaryConditionPointerType; using typename Superclass::InputDefaultBoundaryConditionType; using typename Superclass::RealBoundaryConditionPointerType; using typename Superclass::RealDefaultBoundaryConditionType; @@ -144,7 +143,7 @@ class ITK_TEMPLATE_EXPORT FFTDiscreteGaussianImageFilter : public DiscreteGaussi /** Overridden accessors for unused parameters */ void - SetInputBoundaryCondition(const InputBoundaryConditionPointerType) override; + SetInputBoundaryCondition(BoundaryConditionType *) override; itkSetMacro(KernelSource, FFTDiscreteGaussianImageFilterEnums::KernelSource); itkGetConstMacro(KernelSource, FFTDiscreteGaussianImageFilterEnums::KernelSource); diff --git a/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.hxx b/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.hxx index be90f2bbf16..37399004984 100644 --- a/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.hxx +++ b/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.hxx @@ -67,8 +67,7 @@ FFTDiscreteGaussianImageFilter::GenerateInputRequeste template void -FFTDiscreteGaussianImageFilter::SetInputBoundaryCondition( - const InputBoundaryConditionPointerType) +FFTDiscreteGaussianImageFilter::SetInputBoundaryCondition(BoundaryConditionType *) { itkWarningMacro("FFTDiscreteGaussianImageFilter ignores InputBoundaryCondition, use RealBoundaryCondition instead"); }