From a025c8103f7e2b4d83eaaca0ecfafedaa27cf962 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Thu, 16 Sep 2021 16:25:04 +0200 Subject: [PATCH] STYLE: remove backward compatibility with ITK v5.1 RTK is only maintained with the latest ITK release and ITK v5.2 has been released on April 2021. The sed command use for this patch is for i in include/* ; do sed -i ':a;N;$!ba;s/# *if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1\n ITK_DISALLOW_COPY_AND_ASSIGN.*\(ITK_DISALLOW_COPY_AND_MOVE([[:alnum:]_]*);\)\n# *endif/ \1/g' $i ; done --- include/rtkADMMTotalVariationConeBeamReconstructionFilter.h | 4 ---- include/rtkADMMTotalVariationConjugateGradientOperator.h | 4 ---- include/rtkADMMWaveletsConeBeamReconstructionFilter.h | 4 ---- include/rtkADMMWaveletsConjugateGradientOperator.h | 4 ---- include/rtkAddMatrixAndDiagonalImageFilter.h | 4 ---- include/rtkAdditiveGaussianNoiseImageFilter.h | 4 ---- include/rtkAmsterdamShroudImageFilter.h | 4 ---- include/rtkAverageOutOfROIImageFilter.h | 4 ---- include/rtkBackProjectionImageFilter.h | 4 ---- include/rtkBackwardDifferenceDivergenceImageFilter.h | 4 ---- include/rtkBioscanGeometryReader.h | 4 ---- include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h | 4 ---- include/rtkBoellaardScatterCorrectionImageFilter.h | 4 ---- include/rtkConditionalMedianImageFilter.h | 4 ---- include/rtkConjugateGradientConeBeamReconstructionFilter.h | 4 ---- include/rtkConjugateGradientGetP_kPlusOneImageFilter.h | 4 ---- include/rtkConjugateGradientGetR_kPlusOneImageFilter.h | 4 ---- include/rtkConjugateGradientGetX_kPlusOneImageFilter.h | 4 ---- include/rtkConjugateGradientImageFilter.h | 4 ---- include/rtkConjugateGradientOperator.h | 4 ---- include/rtkConstantImageSource.h | 4 ---- include/rtkConvexShape.h | 4 ---- include/rtkCudaAverageOutOfROIImageFilter.h | 4 ---- include/rtkCudaBackProjectionImageFilter.h | 4 ---- include/rtkCudaConjugateGradientImageFilter.h | 4 ---- include/rtkCudaConstantVolumeSeriesSource.h | 4 ---- include/rtkCudaConstantVolumeSource.h | 4 ---- include/rtkCudaCropImageFilter.h | 4 ---- include/rtkCudaCyclicDeformationImageFilter.h | 4 ---- include/rtkCudaDisplacedDetectorImageFilter.h | 4 ---- include/rtkCudaFDKBackProjectionImageFilter.h | 4 ---- include/rtkCudaFDKConeBeamReconstructionFilter.h | 4 ---- include/rtkCudaFDKWeightProjectionFilter.h | 4 ---- include/rtkCudaFFTProjectionsConvolutionImageFilter.h | 4 ---- include/rtkCudaFFTRampImageFilter.h | 4 ---- include/rtkCudaForwardProjectionImageFilter.h | 4 ---- include/rtkCudaForwardWarpImageFilter.h | 4 ---- include/rtkCudaInterpolateImageFilter.h | 4 ---- include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h | 4 ---- include/rtkCudaLagCorrectionImageFilter.h | 4 ---- include/rtkCudaLaplacianImageFilter.h | 4 ---- include/rtkCudaLastDimensionTVDenoisingImageFilter.h | 4 ---- include/rtkCudaParkerShortScanImageFilter.h | 4 ---- include/rtkCudaPolynomialGainCorrectionImageFilter.h | 4 ---- include/rtkCudaRayCastBackProjectionImageFilter.h | 4 ---- include/rtkCudaScatterGlareCorrectionImageFilter.h | 4 ---- include/rtkCudaSplatImageFilter.h | 4 ---- include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h | 4 ---- include/rtkCudaWarpBackProjectionImageFilter.h | 4 ---- include/rtkCudaWarpForwardProjectionImageFilter.h | 4 ---- include/rtkCudaWarpImageFilter.h | 4 ---- include/rtkCudaWeidingerForwardModelImageFilter.h | 4 ---- include/rtkCyclicDeformationImageFilter.h | 4 ---- include/rtkDCMImagXImageIO.h | 4 ---- include/rtkDCMImagXImageIOFactory.h | 4 ---- include/rtkDPExtractShroudSignalImageFilter.h | 4 ---- include/rtkDaubechiesWaveletsConvolutionImageFilter.h | 4 ---- include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h | 4 ---- include/rtkDePierroRegularizationImageFilter.h | 4 ---- include/rtkDeconstructImageFilter.h | 4 ---- include/rtkDeconstructSoftThresholdReconstructImageFilter.h | 4 ---- include/rtkDenoisingBPDQImageFilter.h | 4 ---- include/rtkDigisensGeometryReader.h | 4 ---- include/rtkDigisensGeometryXMLFileReader.h | 4 ---- include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h | 4 ---- include/rtkDisplacedDetectorImageFilter.h | 4 ---- include/rtkDivergenceOfGradientConjugateGradientOperator.h | 4 ---- include/rtkDownsampleImageFilter.h | 4 ---- include/rtkDrawBoxImageFilter.h | 4 ---- include/rtkDrawConeImageFilter.h | 4 ---- include/rtkDrawConvexImageFilter.h | 4 ---- include/rtkDrawCylinderImageFilter.h | 4 ---- include/rtkDrawEllipsoidImageFilter.h | 4 ---- include/rtkDrawGeometricPhantomImageFilter.h | 4 ---- include/rtkDrawQuadricImageFilter.h | 4 ---- include/rtkDrawSheppLoganFilter.h | 4 ---- include/rtkDualEnergyNegativeLogLikelihood.h | 4 ---- include/rtkEdfImageIO.h | 4 ---- include/rtkEdfImageIOFactory.h | 4 ---- include/rtkEdfRawToAttenuationImageFilter.h | 4 ---- include/rtkElektaSynergyGeometryReader.h | 4 ---- include/rtkElektaSynergyLookupTableImageFilter.h | 4 ---- include/rtkElektaSynergyRawLookupTableImageFilter.h | 4 ---- include/rtkElektaXVI5GeometryXMLFile.h | 4 ---- include/rtkExtractPhaseImageFilter.h | 4 ---- include/rtkFDKBackProjectionImageFilter.h | 4 ---- include/rtkFDKConeBeamReconstructionFilter.h | 4 ---- include/rtkFDKWarpBackProjectionImageFilter.h | 4 ---- include/rtkFDKWeightProjectionFilter.h | 4 ---- include/rtkFFTProjectionsConvolutionImageFilter.h | 4 ---- include/rtkFFTRampImageFilter.h | 4 ---- include/rtkFieldOfViewImageFilter.h | 4 ---- include/rtkForbildPhantomFileReader.h | 4 ---- include/rtkForwardDifferenceGradientImageFilter.h | 4 ---- include/rtkForwardProjectionImageFilter.h | 4 ---- include/rtkForwardWarpImageFilter.h | 4 ---- .../rtkFourDConjugateGradientConeBeamReconstructionFilter.h | 4 ---- include/rtkFourDROOSTERConeBeamReconstructionFilter.h | 4 ---- include/rtkFourDReconstructionConjugateGradientOperator.h | 4 ---- include/rtkFourDSARTConeBeamReconstructionFilter.h | 4 ---- include/rtkFourDToProjectionStackImageFilter.h | 4 ---- include/rtkGeometricPhantom.h | 4 ---- include/rtkGeometricPhantomFileReader.h | 4 ---- include/rtkGetNewtonUpdateImageFilter.h | 4 ---- include/rtkGlobalResourceProbe.h | 4 ---- include/rtkHilbertImageFilter.h | 4 ---- include/rtkHisImageIOFactory.h | 4 ---- include/rtkHndImageIOFactory.h | 4 ---- include/rtkI0EstimationProjectionFilter.h | 4 ---- include/rtkImagXGeometryReader.h | 4 ---- include/rtkImagXImageIOFactory.h | 4 ---- include/rtkImagXXMLFileReader.h | 4 ---- include/rtkImageToVectorImageFilter.h | 4 ---- include/rtkImportImageFilter.h | 4 ---- include/rtkInterpolatorWithKnownWeightsImageFilter.h | 4 ---- include/rtkIterativeConeBeamReconstructionFilter.h | 4 ---- include/rtkIterativeFDKConeBeamReconstructionFilter.h | 4 ---- include/rtkJosephBackAttenuatedProjectionImageFilter.h | 4 ---- include/rtkJosephBackProjectionImageFilter.h | 4 ---- include/rtkJosephForwardAttenuatedProjectionImageFilter.h | 4 ---- include/rtkJosephForwardProjectionImageFilter.h | 4 ---- include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h | 4 ---- include/rtkLagCorrectionImageFilter.h | 4 ---- include/rtkLaplacianImageFilter.h | 4 ---- include/rtkLastDimensionL0GradientDenoisingImageFilter.h | 4 ---- include/rtkLookupTableImageFilter.h | 4 ---- include/rtkMagnitudeThresholdImageFilter.h | 4 ---- include/rtkMaskCollimationImageFilter.h | 4 ---- include/rtkMechlemOneStepSpectralReconstructionFilter.h | 4 ---- ...nsatedFourDConjugateGradientConeBeamReconstructionFilter.h | 4 ---- ...otionCompensatedFourDROOSTERConeBeamReconstructionFilter.h | 4 ---- ...nCompensatedFourDReconstructionConjugateGradientOperator.h | 4 ---- include/rtkMultiplyByVectorImageFilter.h | 4 ---- include/rtkNesterovUpdateImageFilter.h | 4 ---- include/rtkOSEMConeBeamReconstructionFilter.h | 4 ---- include/rtkOraGeometryReader.h | 4 ---- include/rtkOraImageIOFactory.h | 4 ---- include/rtkOraLookupTableImageFilter.h | 4 ---- include/rtkOraXMLFileReader.h | 4 ---- include/rtkParkerShortScanImageFilter.h | 4 ---- include/rtkPhaseGatingImageFilter.h | 4 ---- include/rtkPhaseReader.h | 4 ---- include/rtkPhasesToInterpolationWeights.h | 4 ---- include/rtkPolynomialGainCorrectionImageFilter.h | 4 ---- include/rtkProjectGeometricPhantomImageFilter.h | 4 ---- include/rtkProjectionGeometry.h | 4 ---- include/rtkProjectionStackToFourDImageFilter.h | 4 ---- include/rtkProjectionsDecompositionNegativeLogLikelihood.h | 4 ---- include/rtkProjectionsReader.h | 4 ---- include/rtkRayBoxIntersectionImageFilter.h | 4 ---- include/rtkRayConvexIntersectionImageFilter.h | 4 ---- include/rtkRayEllipsoidIntersectionImageFilter.h | 4 ---- include/rtkRayQuadricIntersectionImageFilter.h | 4 ---- include/rtkReconstructImageFilter.h | 4 ---- include/rtkReconstructionConjugateGradientOperator.h | 4 ---- include/rtkReg1DExtractShroudSignalImageFilter.h | 4 ---- include/rtkReg23ProjectionGeometry.h | 4 ---- ...RegularizedConjugateGradientConeBeamReconstructionFilter.h | 4 ---- include/rtkReorderProjectionsImageFilter.h | 4 ---- include/rtkSARTConeBeamReconstructionFilter.h | 4 ---- include/rtkScatterGlareCorrectionImageFilter.h | 4 ---- include/rtkSchlomka2008NegativeLogLikelihood.h | 4 ---- include/rtkSelectOneProjectionPerCycleImageFilter.h | 4 ---- .../rtkSeparableQuadraticSurrogateRegularizationImageFilter.h | 4 ---- include/rtkSheppLoganPhantom.h | 4 ---- include/rtkSheppLoganPhantomFilter.h | 4 ---- include/rtkSignalToInterpolationWeights.h | 4 ---- .../rtkSimplexSpectralProjectionsDecompositionImageFilter.h | 4 ---- include/rtkSingularValueThresholdImageFilter.h | 4 ---- include/rtkSoftThresholdImageFilter.h | 4 ---- include/rtkSoftThresholdTVImageFilter.h | 4 ---- include/rtkSpectralForwardModelImageFilter.h | 4 ---- include/rtkSplatWithKnownWeightsImageFilter.h | 4 ---- include/rtkSubSelectFromListImageFilter.h | 4 ---- include/rtkSubSelectImageFilter.h | 4 ---- include/rtkSumOfSquaresImageFilter.h | 4 ---- include/rtkThreeDCircularProjectionGeometry.h | 4 ---- include/rtkThreeDCircularProjectionGeometryXMLFileReader.h | 4 ---- include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h | 4 ---- include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h | 4 ---- include/rtkTotalVariationDenoiseSequenceImageFilter.h | 4 ---- include/rtkTotalVariationDenoisingBPDQImageFilter.h | 4 ---- include/rtkTotalVariationImageFilter.h | 4 ---- include/rtkUnwarpSequenceConjugateGradientOperator.h | 4 ---- include/rtkUnwarpSequenceImageFilter.h | 4 ---- include/rtkUpsampleImageFilter.h | 4 ---- include/rtkVarianObiGeometryReader.h | 4 ---- include/rtkVarianObiRawImageFilter.h | 4 ---- include/rtkVarianObiXMLFileReader.h | 4 ---- include/rtkVarianProBeamGeometryReader.h | 4 ---- include/rtkVarianProBeamXMLFileReader.h | 4 ---- include/rtkVectorImageToImageFilter.h | 4 ---- include/rtkWarpFourDToProjectionStackImageFilter.h | 4 ---- include/rtkWarpProjectionStackToFourDImageFilter.h | 4 ---- include/rtkWarpSequenceImageFilter.h | 4 ---- include/rtkWaterPrecorrectionImageFilter.h | 4 ---- include/rtkWeidingerForwardModelImageFilter.h | 4 ---- include/rtkXRadGeometryReader.h | 4 ---- include/rtkXRadImageIOFactory.h | 4 ---- include/rtkXRadRawToAttenuationImageFilter.h | 4 ---- include/rtkXimImageIOFactory.h | 4 ---- 201 files changed, 804 deletions(-) diff --git a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h index 43db054bc..3710f10df 100644 --- a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h +++ b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h @@ -138,11 +138,7 @@ class ITK_TEMPLATE_EXPORT ADMMTotalVariationConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ADMMTotalVariationConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ADMMTotalVariationConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = ADMMTotalVariationConeBeamReconstructionFilter; diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.h b/include/rtkADMMTotalVariationConjugateGradientOperator.h index 1549ef39a..1acfa1c1e 100644 --- a/include/rtkADMMTotalVariationConjugateGradientOperator.h +++ b/include/rtkADMMTotalVariationConjugateGradientOperator.h @@ -107,11 +107,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ADMMTotalVariationConjugateGradientOperator); -#else ITK_DISALLOW_COPY_AND_MOVE(ADMMTotalVariationConjugateGradientOperator); -#endif /** Standard class type alias. */ using Self = ADMMTotalVariationConjugateGradientOperator; diff --git a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h index d9d02f908..92035b109 100644 --- a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h +++ b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h @@ -144,11 +144,7 @@ class ITK_TEMPLATE_EXPORT ADMMWaveletsConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ADMMWaveletsConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ADMMWaveletsConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = ADMMWaveletsConeBeamReconstructionFilter; diff --git a/include/rtkADMMWaveletsConjugateGradientOperator.h b/include/rtkADMMWaveletsConjugateGradientOperator.h index 010ec6f52..4137ba00c 100644 --- a/include/rtkADMMWaveletsConjugateGradientOperator.h +++ b/include/rtkADMMWaveletsConjugateGradientOperator.h @@ -98,11 +98,7 @@ template class ITK_TEMPLATE_EXPORT ADMMWaveletsConjugateGradientOperator : public ConjugateGradientOperator { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ADMMWaveletsConjugateGradientOperator); -#else ITK_DISALLOW_COPY_AND_MOVE(ADMMWaveletsConjugateGradientOperator); -#endif /** Standard class type alias. */ using Self = ADMMWaveletsConjugateGradientOperator; diff --git a/include/rtkAddMatrixAndDiagonalImageFilter.h b/include/rtkAddMatrixAndDiagonalImageFilter.h index ed0afaf03..4619997f4 100644 --- a/include/rtkAddMatrixAndDiagonalImageFilter.h +++ b/include/rtkAddMatrixAndDiagonalImageFilter.h @@ -44,11 +44,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(AddMatrixAndDiagonalImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(AddMatrixAndDiagonalImageFilter); -#endif /** Standard class type alias. */ using Self = AddMatrixAndDiagonalImageFilter; diff --git a/include/rtkAdditiveGaussianNoiseImageFilter.h b/include/rtkAdditiveGaussianNoiseImageFilter.h index 4fed96002..a822a3485 100644 --- a/include/rtkAdditiveGaussianNoiseImageFilter.h +++ b/include/rtkAdditiveGaussianNoiseImageFilter.h @@ -171,11 +171,7 @@ template class ITK_TEMPLATE_EXPORT AdditiveGaussianNoiseImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(AdditiveGaussianNoiseImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(AdditiveGaussianNoiseImageFilter); -#endif /** Standard class type alias. */ using Self = AdditiveGaussianNoiseImageFilter; diff --git a/include/rtkAmsterdamShroudImageFilter.h b/include/rtkAmsterdamShroudImageFilter.h index 5cd518520..d6883532f 100644 --- a/include/rtkAmsterdamShroudImageFilter.h +++ b/include/rtkAmsterdamShroudImageFilter.h @@ -82,11 +82,7 @@ class ITK_TEMPLATE_EXPORT AmsterdamShroudImageFilter : public itk::ImageToImageFilter> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(AmsterdamShroudImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(AmsterdamShroudImageFilter); -#endif /** Standard class type alias. */ using Self = AmsterdamShroudImageFilter; diff --git a/include/rtkAverageOutOfROIImageFilter.h b/include/rtkAverageOutOfROIImageFilter.h index a0df23c88..9a9addd13 100644 --- a/include/rtkAverageOutOfROIImageFilter.h +++ b/include/rtkAverageOutOfROIImageFilter.h @@ -52,11 +52,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(AverageOutOfROIImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(AverageOutOfROIImageFilter); -#endif /** Standard class type alias. */ using Self = AverageOutOfROIImageFilter; diff --git a/include/rtkBackProjectionImageFilter.h b/include/rtkBackProjectionImageFilter.h index 43fab0d7d..7b290279f 100644 --- a/include/rtkBackProjectionImageFilter.h +++ b/include/rtkBackProjectionImageFilter.h @@ -50,11 +50,7 @@ template class ITK_TEMPLATE_EXPORT BackProjectionImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(BackProjectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(BackProjectionImageFilter); -#endif /** Standard class type alias. */ using Self = BackProjectionImageFilter; diff --git a/include/rtkBackwardDifferenceDivergenceImageFilter.h b/include/rtkBackwardDifferenceDivergenceImageFilter.h index 17e478e2b..2c3fe73fe 100644 --- a/include/rtkBackwardDifferenceDivergenceImageFilter.h +++ b/include/rtkBackwardDifferenceDivergenceImageFilter.h @@ -41,11 +41,7 @@ class ITK_TEMPLATE_EXPORT BackwardDifferenceDivergenceImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(BackwardDifferenceDivergenceImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(BackwardDifferenceDivergenceImageFilter); -#endif /** Extract dimension from input and output image. */ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); diff --git a/include/rtkBioscanGeometryReader.h b/include/rtkBioscanGeometryReader.h index e07f9a00a..bac8bddfd 100644 --- a/include/rtkBioscanGeometryReader.h +++ b/include/rtkBioscanGeometryReader.h @@ -52,11 +52,7 @@ namespace rtk class RTK_EXPORT BioscanGeometryReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(BioscanGeometryReader); -#else ITK_DISALLOW_COPY_AND_MOVE(BioscanGeometryReader); -#endif /** Standard type alias */ using Self = BioscanGeometryReader; diff --git a/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h b/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h index 01c1cc599..4e0edeed6 100644 --- a/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h +++ b/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h @@ -40,11 +40,7 @@ class ITK_TEMPLATE_EXPORT BlockDiagonalMatrixVectorMultiplyImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(BlockDiagonalMatrixVectorMultiplyImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(BlockDiagonalMatrixVectorMultiplyImageFilter); -#endif /** Standard class type alias. */ using Self = BlockDiagonalMatrixVectorMultiplyImageFilter; diff --git a/include/rtkBoellaardScatterCorrectionImageFilter.h b/include/rtkBoellaardScatterCorrectionImageFilter.h index 38e463535..5c044d66e 100644 --- a/include/rtkBoellaardScatterCorrectionImageFilter.h +++ b/include/rtkBoellaardScatterCorrectionImageFilter.h @@ -41,11 +41,7 @@ class ITK_TEMPLATE_EXPORT BoellaardScatterCorrectionImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(BoellaardScatterCorrectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(BoellaardScatterCorrectionImageFilter); -#endif /** Standard class type alias. */ using Self = BoellaardScatterCorrectionImageFilter; diff --git a/include/rtkConditionalMedianImageFilter.h b/include/rtkConditionalMedianImageFilter.h index d697f1460..b531bfedf 100644 --- a/include/rtkConditionalMedianImageFilter.h +++ b/include/rtkConditionalMedianImageFilter.h @@ -49,11 +49,7 @@ template class ITK_TEMPLATE_EXPORT ConditionalMedianImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ConditionalMedianImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ConditionalMedianImageFilter); -#endif /** Standard class type alias. */ using Self = ConditionalMedianImageFilter; diff --git a/include/rtkConjugateGradientConeBeamReconstructionFilter.h b/include/rtkConjugateGradientConeBeamReconstructionFilter.h index 753f3f052..3cc31839a 100644 --- a/include/rtkConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkConjugateGradientConeBeamReconstructionFilter.h @@ -111,11 +111,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientConeBeamReconstructionFilter : public IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = ConjugateGradientConeBeamReconstructionFilter; diff --git a/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h index fa05da66a..95145bded 100644 --- a/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h @@ -36,11 +36,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetP_kPlusOneImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientGetP_kPlusOneImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientGetP_kPlusOneImageFilter); -#endif /** Standard class type alias. */ using Self = ConjugateGradientGetP_kPlusOneImageFilter; diff --git a/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h index 171a9a9da..bbf8fe15e 100644 --- a/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h @@ -38,11 +38,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetR_kPlusOneImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientGetR_kPlusOneImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientGetR_kPlusOneImageFilter); -#endif /** Standard class type alias. */ using Self = ConjugateGradientGetR_kPlusOneImageFilter; diff --git a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h index da26e9be4..f08b966d5 100644 --- a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h @@ -36,11 +36,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetX_kPlusOneImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientGetX_kPlusOneImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientGetX_kPlusOneImageFilter); -#endif /** Standard class type alias. */ using Self = ConjugateGradientGetX_kPlusOneImageFilter; diff --git a/include/rtkConjugateGradientImageFilter.h b/include/rtkConjugateGradientImageFilter.h index 0f115e12b..451255c63 100644 --- a/include/rtkConjugateGradientImageFilter.h +++ b/include/rtkConjugateGradientImageFilter.h @@ -47,11 +47,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientImageFilter); -#endif /** Standard class type alias. */ using Self = ConjugateGradientImageFilter; diff --git a/include/rtkConjugateGradientOperator.h b/include/rtkConjugateGradientOperator.h index 482a63d3f..8b982d268 100644 --- a/include/rtkConjugateGradientOperator.h +++ b/include/rtkConjugateGradientOperator.h @@ -32,11 +32,7 @@ template class ITK_TEMPLATE_EXPORT ConjugateGradientOperator : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientOperator); -#else ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientOperator); -#endif /** Standard class type alias. */ using Self = ConjugateGradientOperator; diff --git a/include/rtkConstantImageSource.h b/include/rtkConstantImageSource.h index bb6d83cf7..67e14d34f 100644 --- a/include/rtkConstantImageSource.h +++ b/include/rtkConstantImageSource.h @@ -51,11 +51,7 @@ template class ITK_TEMPLATE_EXPORT ConstantImageSource : public itk::ImageSource { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ConstantImageSource); -#else ITK_DISALLOW_COPY_AND_MOVE(ConstantImageSource); -#endif /** Standard class type alias. */ using Self = ConstantImageSource; diff --git a/include/rtkConvexShape.h b/include/rtkConvexShape.h index 7a04c367a..0695739ac 100644 --- a/include/rtkConvexShape.h +++ b/include/rtkConvexShape.h @@ -46,11 +46,7 @@ namespace rtk class RTK_EXPORT ConvexShape : public itk::DataObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ConvexShape); -#else ITK_DISALLOW_COPY_AND_MOVE(ConvexShape); -#endif /** Standard class type alias. */ using Self = ConvexShape; diff --git a/include/rtkCudaAverageOutOfROIImageFilter.h b/include/rtkCudaAverageOutOfROIImageFilter.h index 233353d85..6dffa1cbf 100644 --- a/include/rtkCudaAverageOutOfROIImageFilter.h +++ b/include/rtkCudaAverageOutOfROIImageFilter.h @@ -47,11 +47,7 @@ class RTK_EXPORT CudaAverageOutOfROIImageFilter { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaAverageOutOfROIImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaAverageOutOfROIImageFilter); -# endif /** Standard class type alias. */ using Self = rtk::CudaAverageOutOfROIImageFilter; diff --git a/include/rtkCudaBackProjectionImageFilter.h b/include/rtkCudaBackProjectionImageFilter.h index cbfd9a344..b3d567346 100644 --- a/include/rtkCudaBackProjectionImageFilter.h +++ b/include/rtkCudaBackProjectionImageFilter.h @@ -51,11 +51,7 @@ class ITK_TEMPLATE_EXPORT CudaBackProjectionImageFilter : public itk::CudaInPlaceImageFilter> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaBackProjectionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaBackProjectionImageFilter); -# endif /** Standard class type alias. */ using BackProjectionImageFilterType = BackProjectionImageFilter; diff --git a/include/rtkCudaConjugateGradientImageFilter.h b/include/rtkCudaConjugateGradientImageFilter.h index a156c0583..bc402f52a 100644 --- a/include/rtkCudaConjugateGradientImageFilter.h +++ b/include/rtkCudaConjugateGradientImageFilter.h @@ -45,11 +45,7 @@ class ITK_TEMPLATE_EXPORT CudaConjugateGradientImageFilter : public itk::CudaImageToImageFilter> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaConjugateGradientImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaConjugateGradientImageFilter); -# endif /** Standard class type alias. */ using Self = rtk::CudaConjugateGradientImageFilter; diff --git a/include/rtkCudaConstantVolumeSeriesSource.h b/include/rtkCudaConstantVolumeSeriesSource.h index ff8cd78e3..0042cd6b4 100644 --- a/include/rtkCudaConstantVolumeSeriesSource.h +++ b/include/rtkCudaConstantVolumeSeriesSource.h @@ -46,11 +46,7 @@ class RTK_EXPORT CudaConstantVolumeSeriesSource ConstantImageSource>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaConstantVolumeSeriesSource); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaConstantVolumeSeriesSource); -# endif /** Standard class type alias. */ using Self = rtk::CudaConstantVolumeSeriesSource; diff --git a/include/rtkCudaConstantVolumeSource.h b/include/rtkCudaConstantVolumeSource.h index 416f6fe36..b32116618 100644 --- a/include/rtkCudaConstantVolumeSource.h +++ b/include/rtkCudaConstantVolumeSource.h @@ -46,11 +46,7 @@ class RTK_EXPORT CudaConstantVolumeSource ConstantImageSource>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaConstantVolumeSource); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaConstantVolumeSource); -# endif /** Standard class type alias. */ using Self = rtk::CudaConstantVolumeSource; diff --git a/include/rtkCudaCropImageFilter.h b/include/rtkCudaCropImageFilter.h index 01b8314d8..e8bb68c12 100644 --- a/include/rtkCudaCropImageFilter.h +++ b/include/rtkCudaCropImageFilter.h @@ -51,11 +51,7 @@ class RTK_EXPORT CudaCropImageFilter itk::CropImageFilter, itk::CudaImage>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaCropImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaCropImageFilter); -# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaCyclicDeformationImageFilter.h b/include/rtkCudaCyclicDeformationImageFilter.h index a6c050832..8f95972c8 100644 --- a/include/rtkCudaCyclicDeformationImageFilter.h +++ b/include/rtkCudaCyclicDeformationImageFilter.h @@ -48,11 +48,7 @@ class RTK_EXPORT CudaCyclicDeformationImageFilter itk::CudaImage, 3>>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaCyclicDeformationImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaCyclicDeformationImageFilter); -# endif /** Standard class type alias. */ using Self = rtk::CudaCyclicDeformationImageFilter; diff --git a/include/rtkCudaDisplacedDetectorImageFilter.h b/include/rtkCudaDisplacedDetectorImageFilter.h index 8f1e35637..a29eed4ec 100644 --- a/include/rtkCudaDisplacedDetectorImageFilter.h +++ b/include/rtkCudaDisplacedDetectorImageFilter.h @@ -52,11 +52,7 @@ class RTK_EXPORT CudaDisplacedDetectorImageFilter rtk::DisplacedDetectorImageFilter>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaDisplacedDetectorImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaDisplacedDetectorImageFilter); -# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaFDKBackProjectionImageFilter.h b/include/rtkCudaFDKBackProjectionImageFilter.h index 547ecc08a..eb5ee64b0 100644 --- a/include/rtkCudaFDKBackProjectionImageFilter.h +++ b/include/rtkCudaFDKBackProjectionImageFilter.h @@ -49,11 +49,7 @@ class RTK_EXPORT CudaFDKBackProjectionImageFilter FDKBackProjectionImageFilter, itk::CudaImage>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaFDKBackProjectionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaFDKBackProjectionImageFilter); -# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaFDKConeBeamReconstructionFilter.h b/include/rtkCudaFDKConeBeamReconstructionFilter.h index c72c1a84b..506177db7 100644 --- a/include/rtkCudaFDKConeBeamReconstructionFilter.h +++ b/include/rtkCudaFDKConeBeamReconstructionFilter.h @@ -53,11 +53,7 @@ class RTK_EXPORT CudaFDKConeBeamReconstructionFilter FDKConeBeamReconstructionFilter, itk::CudaImage, float>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaFDKConeBeamReconstructionFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaFDKConeBeamReconstructionFilter); -# endif /** Standard class type alias. */ using Self = CudaFDKConeBeamReconstructionFilter; diff --git a/include/rtkCudaFDKWeightProjectionFilter.h b/include/rtkCudaFDKWeightProjectionFilter.h index 3e3dcd7c1..9edbe96c9 100644 --- a/include/rtkCudaFDKWeightProjectionFilter.h +++ b/include/rtkCudaFDKWeightProjectionFilter.h @@ -53,11 +53,7 @@ class RTK_EXPORT CudaFDKWeightProjectionFilter rtk::FDKWeightProjectionFilter>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaFDKWeightProjectionFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaFDKWeightProjectionFilter); -# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaFFTProjectionsConvolutionImageFilter.h b/include/rtkCudaFFTProjectionsConvolutionImageFilter.h index a785db222..671b5a335 100644 --- a/include/rtkCudaFFTProjectionsConvolutionImageFilter.h +++ b/include/rtkCudaFFTProjectionsConvolutionImageFilter.h @@ -50,11 +50,7 @@ class ITK_TEMPLATE_EXPORT CudaFFTProjectionsConvolutionImageFilter : public itk::CudaImageToImageFilter, itk::CudaImage, TParentImageFilter> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaFFTProjectionsConvolutionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaFFTProjectionsConvolutionImageFilter); -# endif /** Standard class type alias. */ using Self = CudaFFTProjectionsConvolutionImageFilter; diff --git a/include/rtkCudaFFTRampImageFilter.h b/include/rtkCudaFFTRampImageFilter.h index a101215c0..9c5cc9177 100644 --- a/include/rtkCudaFFTRampImageFilter.h +++ b/include/rtkCudaFFTRampImageFilter.h @@ -44,11 +44,7 @@ class RTK_EXPORT CudaFFTRampImageFilter FFTRampImageFilter, itk::CudaImage, float>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaFFTRampImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaFFTRampImageFilter); -# endif /** Standard class type alias. */ using Self = CudaFFTRampImageFilter; diff --git a/include/rtkCudaForwardProjectionImageFilter.h b/include/rtkCudaForwardProjectionImageFilter.h index a6a51ccd3..0cb182655 100644 --- a/include/rtkCudaForwardProjectionImageFilter.h +++ b/include/rtkCudaForwardProjectionImageFilter.h @@ -54,11 +54,7 @@ class ITK_TEMPLATE_EXPORT CudaForwardProjectionImageFilter CudaInPlaceImageFilter> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaForwardProjectionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaForwardProjectionImageFilter); -# endif /** Standard class type alias. */ using Self = CudaForwardProjectionImageFilter; diff --git a/include/rtkCudaForwardWarpImageFilter.h b/include/rtkCudaForwardWarpImageFilter.h index 9c1cebee2..1a1906b8d 100644 --- a/include/rtkCudaForwardWarpImageFilter.h +++ b/include/rtkCudaForwardWarpImageFilter.h @@ -52,11 +52,7 @@ class RTK_EXPORT CudaForwardWarpImageFilter itk::CudaImage, 3>>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaForwardWarpImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaForwardWarpImageFilter); -# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaInterpolateImageFilter.h b/include/rtkCudaInterpolateImageFilter.h index ecdd946b7..cbbec519b 100644 --- a/include/rtkCudaInterpolateImageFilter.h +++ b/include/rtkCudaInterpolateImageFilter.h @@ -47,11 +47,7 @@ class RTK_EXPORT CudaInterpolateImageFilter InterpolatorWithKnownWeightsImageFilter, itk::CudaImage>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaInterpolateImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaInterpolateImageFilter); -# endif /** Standard class type alias. */ using Self = rtk::CudaInterpolateImageFilter; diff --git a/include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h b/include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h index f9a0761b4..76a5baaa5 100644 --- a/include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h +++ b/include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h @@ -55,11 +55,7 @@ class RTK_EXPORT CudaIterativeFDKConeBeamReconstructionFilter IterativeFDKConeBeamReconstructionFilter, itk::CudaImage, float>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaIterativeFDKConeBeamReconstructionFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaIterativeFDKConeBeamReconstructionFilter); -# endif /** Standard class type alias. */ using Self = CudaIterativeFDKConeBeamReconstructionFilter; diff --git a/include/rtkCudaLagCorrectionImageFilter.h b/include/rtkCudaLagCorrectionImageFilter.h index e0d706197..10208ba67 100644 --- a/include/rtkCudaLagCorrectionImageFilter.h +++ b/include/rtkCudaLagCorrectionImageFilter.h @@ -51,11 +51,7 @@ class RTK_EXPORT CudaLagCorrectionImageFilter LagCorrectionImageFilter, 4>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaLagCorrectionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaLagCorrectionImageFilter); -# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaLaplacianImageFilter.h b/include/rtkCudaLaplacianImageFilter.h index b86f4c05e..e8ffa69d1 100644 --- a/include/rtkCudaLaplacianImageFilter.h +++ b/include/rtkCudaLaplacianImageFilter.h @@ -45,11 +45,7 @@ class RTK_EXPORT CudaLaplacianImageFilter LaplacianImageFilter, itk::CudaImage, 3>>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaLaplacianImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaLaplacianImageFilter); -# endif /** Standard class type alias. */ using Self = rtk::CudaLaplacianImageFilter; diff --git a/include/rtkCudaLastDimensionTVDenoisingImageFilter.h b/include/rtkCudaLastDimensionTVDenoisingImageFilter.h index 497f2ea53..5315ef33b 100644 --- a/include/rtkCudaLastDimensionTVDenoisingImageFilter.h +++ b/include/rtkCudaLastDimensionTVDenoisingImageFilter.h @@ -49,11 +49,7 @@ class RTK_EXPORT CudaLastDimensionTVDenoisingImageFilter itk::CudaImage, 4>>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaLastDimensionTVDenoisingImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaLastDimensionTVDenoisingImageFilter); -# endif /** Standard class type alias. */ using Self = rtk::CudaLastDimensionTVDenoisingImageFilter; diff --git a/include/rtkCudaParkerShortScanImageFilter.h b/include/rtkCudaParkerShortScanImageFilter.h index eadb5db22..771a3a212 100644 --- a/include/rtkCudaParkerShortScanImageFilter.h +++ b/include/rtkCudaParkerShortScanImageFilter.h @@ -52,11 +52,7 @@ class RTK_EXPORT CudaParkerShortScanImageFilter rtk::ParkerShortScanImageFilter>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaParkerShortScanImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaParkerShortScanImageFilter); -# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaPolynomialGainCorrectionImageFilter.h b/include/rtkCudaPolynomialGainCorrectionImageFilter.h index c6914e851..3cc40a06c 100644 --- a/include/rtkCudaPolynomialGainCorrectionImageFilter.h +++ b/include/rtkCudaPolynomialGainCorrectionImageFilter.h @@ -52,11 +52,7 @@ class RTK_EXPORT CudaPolynomialGainCorrectionImageFilter PolynomialGainCorrectionImageFilter, itk::CudaImage>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaPolynomialGainCorrectionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaPolynomialGainCorrectionImageFilter); -# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaRayCastBackProjectionImageFilter.h b/include/rtkCudaRayCastBackProjectionImageFilter.h index 233be9a6d..54c9eb580 100644 --- a/include/rtkCudaRayCastBackProjectionImageFilter.h +++ b/include/rtkCudaRayCastBackProjectionImageFilter.h @@ -52,11 +52,7 @@ class RTK_EXPORT CudaRayCastBackProjectionImageFilter BackProjectionImageFilter, itk::CudaImage>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaRayCastBackProjectionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaRayCastBackProjectionImageFilter); -# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaScatterGlareCorrectionImageFilter.h b/include/rtkCudaScatterGlareCorrectionImageFilter.h index 42f0e7ac6..ceee8bbce 100644 --- a/include/rtkCudaScatterGlareCorrectionImageFilter.h +++ b/include/rtkCudaScatterGlareCorrectionImageFilter.h @@ -45,11 +45,7 @@ class CudaScatterGlareCorrectionImageFilter ScatterGlareCorrectionImageFilter, itk::CudaImage, float>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaScatterGlareCorrectionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaScatterGlareCorrectionImageFilter); -# endif /** Standard class type alias. */ using Self = CudaScatterGlareCorrectionImageFilter; diff --git a/include/rtkCudaSplatImageFilter.h b/include/rtkCudaSplatImageFilter.h index 8ba98c76b..0f5a65990 100644 --- a/include/rtkCudaSplatImageFilter.h +++ b/include/rtkCudaSplatImageFilter.h @@ -48,11 +48,7 @@ class RTK_EXPORT CudaSplatImageFilter { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaSplatImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaSplatImageFilter); -# endif /** Standard class type alias. */ using Self = rtk::CudaSplatImageFilter; diff --git a/include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h b/include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h index e0cbf4fe0..18def7b1b 100644 --- a/include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h +++ b/include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h @@ -48,11 +48,7 @@ class RTK_EXPORT CudaTotalVariationDenoisingBPDQImageFilter itk::CudaImage, 3>>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaTotalVariationDenoisingBPDQImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaTotalVariationDenoisingBPDQImageFilter); -# endif /** Standard class type alias. */ using Self = rtk::CudaTotalVariationDenoisingBPDQImageFilter; diff --git a/include/rtkCudaWarpBackProjectionImageFilter.h b/include/rtkCudaWarpBackProjectionImageFilter.h index 1d3ec14da..21eca3232 100644 --- a/include/rtkCudaWarpBackProjectionImageFilter.h +++ b/include/rtkCudaWarpBackProjectionImageFilter.h @@ -50,11 +50,7 @@ class RTK_EXPORT CudaWarpBackProjectionImageFilter BackProjectionImageFilter, itk::CudaImage>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaWarpBackProjectionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaWarpBackProjectionImageFilter); -# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaWarpForwardProjectionImageFilter.h b/include/rtkCudaWarpForwardProjectionImageFilter.h index 22906286b..49fff9bda 100644 --- a/include/rtkCudaWarpForwardProjectionImageFilter.h +++ b/include/rtkCudaWarpForwardProjectionImageFilter.h @@ -50,11 +50,7 @@ class RTK_EXPORT CudaWarpForwardProjectionImageFilter ForwardProjectionImageFilter, itk::CudaImage>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaWarpForwardProjectionImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaWarpForwardProjectionImageFilter); -# endif /** Standard class type alias. */ using InputImageType = itk::CudaImage; diff --git a/include/rtkCudaWarpImageFilter.h b/include/rtkCudaWarpImageFilter.h index 180f1cdad..26264727d 100644 --- a/include/rtkCudaWarpImageFilter.h +++ b/include/rtkCudaWarpImageFilter.h @@ -51,11 +51,7 @@ class RTK_EXPORT CudaWarpImageFilter itk::CudaImage, 3>>> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaWarpImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaWarpImageFilter); -# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaWeidingerForwardModelImageFilter.h b/include/rtkCudaWeidingerForwardModelImageFilter.h index ea6ca6035..3b4a948e2 100644 --- a/include/rtkCudaWeidingerForwardModelImageFilter.h +++ b/include/rtkCudaWeidingerForwardModelImageFilter.h @@ -50,11 +50,7 @@ class ITK_TEMPLATE_EXPORT CudaWeidingerForwardModelImageFilter WeidingerForwardModelImageFilter> { public: -# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CudaWeidingerForwardModelImageFilter); -# else ITK_DISALLOW_COPY_AND_MOVE(CudaWeidingerForwardModelImageFilter); -# endif /** Standard class type alias. */ using Self = CudaWeidingerForwardModelImageFilter; diff --git a/include/rtkCyclicDeformationImageFilter.h b/include/rtkCyclicDeformationImageFilter.h index a7c6ae708..a68a94e1c 100644 --- a/include/rtkCyclicDeformationImageFilter.h +++ b/include/rtkCyclicDeformationImageFilter.h @@ -50,11 +50,7 @@ template class ITK_TEMPLATE_EXPORT CyclicDeformationImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(CyclicDeformationImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(CyclicDeformationImageFilter); -#endif /** Standard class type alias. */ using Self = CyclicDeformationImageFilter; diff --git a/include/rtkDCMImagXImageIO.h b/include/rtkDCMImagXImageIO.h index 0ea1e1883..86857369e 100644 --- a/include/rtkDCMImagXImageIO.h +++ b/include/rtkDCMImagXImageIO.h @@ -36,11 +36,7 @@ namespace rtk class RTK_EXPORT DCMImagXImageIO : public itk::GDCMImageIO { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DCMImagXImageIO); -#else ITK_DISALLOW_COPY_AND_MOVE(DCMImagXImageIO); -#endif /** Standard class type alias. */ using Self = DCMImagXImageIO; diff --git a/include/rtkDCMImagXImageIOFactory.h b/include/rtkDCMImagXImageIOFactory.h index 0d76d3776..7feced182 100644 --- a/include/rtkDCMImagXImageIOFactory.h +++ b/include/rtkDCMImagXImageIOFactory.h @@ -37,11 +37,7 @@ namespace rtk class RTK_EXPORT DCMImagXImageIOFactory : public itk::ObjectFactoryBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DCMImagXImageIOFactory); -#else ITK_DISALLOW_COPY_AND_MOVE(DCMImagXImageIOFactory); -#endif /** Standard class type alias. */ using Self = DCMImagXImageIOFactory; diff --git a/include/rtkDPExtractShroudSignalImageFilter.h b/include/rtkDPExtractShroudSignalImageFilter.h index 7ba6ed334..f083b135d 100644 --- a/include/rtkDPExtractShroudSignalImageFilter.h +++ b/include/rtkDPExtractShroudSignalImageFilter.h @@ -39,11 +39,7 @@ class ITK_TEMPLATE_EXPORT DPExtractShroudSignalImageFilter : public itk::ImageToImageFilter, itk::Image> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DPExtractShroudSignalImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DPExtractShroudSignalImageFilter); -#endif /** Standard class type alias. */ using TInputImage = itk::Image; diff --git a/include/rtkDaubechiesWaveletsConvolutionImageFilter.h b/include/rtkDaubechiesWaveletsConvolutionImageFilter.h index 98284385f..c296d213f 100644 --- a/include/rtkDaubechiesWaveletsConvolutionImageFilter.h +++ b/include/rtkDaubechiesWaveletsConvolutionImageFilter.h @@ -45,11 +45,7 @@ template class ITK_TEMPLATE_EXPORT DaubechiesWaveletsConvolutionImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DaubechiesWaveletsConvolutionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DaubechiesWaveletsConvolutionImageFilter); -#endif enum Pass { diff --git a/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h b/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h index f33773fcf..5a37580b1 100644 --- a/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h +++ b/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h @@ -75,11 +75,7 @@ class ITK_TEMPLATE_EXPORT DaubechiesWaveletsDenoiseSequenceImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DaubechiesWaveletsDenoiseSequenceImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DaubechiesWaveletsDenoiseSequenceImageFilter); -#endif /** Standard class type alias. */ using Self = DaubechiesWaveletsDenoiseSequenceImageFilter; diff --git a/include/rtkDePierroRegularizationImageFilter.h b/include/rtkDePierroRegularizationImageFilter.h index 364f13e6a..00653df23 100644 --- a/include/rtkDePierroRegularizationImageFilter.h +++ b/include/rtkDePierroRegularizationImageFilter.h @@ -75,11 +75,7 @@ template class ITK_TEMPLATE_EXPORT DePierroRegularizationImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DePierroRegularizationImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DePierroRegularizationImageFilter); -#endif /** Standard class type alias. */ using Self = DePierroRegularizationImageFilter; diff --git a/include/rtkDeconstructImageFilter.h b/include/rtkDeconstructImageFilter.h index 0dba9dab6..ff59054ec 100644 --- a/include/rtkDeconstructImageFilter.h +++ b/include/rtkDeconstructImageFilter.h @@ -128,11 +128,7 @@ template class ITK_TEMPLATE_EXPORT DeconstructImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DeconstructImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DeconstructImageFilter); -#endif /** Standard class type alias. */ using Self = DeconstructImageFilter; diff --git a/include/rtkDeconstructSoftThresholdReconstructImageFilter.h b/include/rtkDeconstructSoftThresholdReconstructImageFilter.h index 7d6305f16..eb1210632 100644 --- a/include/rtkDeconstructSoftThresholdReconstructImageFilter.h +++ b/include/rtkDeconstructSoftThresholdReconstructImageFilter.h @@ -48,11 +48,7 @@ class ITK_TEMPLATE_EXPORT DeconstructSoftThresholdReconstructImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DeconstructSoftThresholdReconstructImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DeconstructSoftThresholdReconstructImageFilter); -#endif /** Standard class type alias. */ using Self = DeconstructSoftThresholdReconstructImageFilter; diff --git a/include/rtkDenoisingBPDQImageFilter.h b/include/rtkDenoisingBPDQImageFilter.h index dfa8bcf2d..3873f394d 100644 --- a/include/rtkDenoisingBPDQImageFilter.h +++ b/include/rtkDenoisingBPDQImageFilter.h @@ -41,11 +41,7 @@ template class ITK_TEMPLATE_EXPORT DenoisingBPDQImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DenoisingBPDQImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DenoisingBPDQImageFilter); -#endif /** Standard class type alias. */ using Self = DenoisingBPDQImageFilter; diff --git a/include/rtkDigisensGeometryReader.h b/include/rtkDigisensGeometryReader.h index 5a03e81a0..b73399177 100644 --- a/include/rtkDigisensGeometryReader.h +++ b/include/rtkDigisensGeometryReader.h @@ -40,11 +40,7 @@ namespace rtk class RTK_EXPORT DigisensGeometryReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DigisensGeometryReader); -#else ITK_DISALLOW_COPY_AND_MOVE(DigisensGeometryReader); -#endif /** Standard type alias */ using Self = DigisensGeometryReader; diff --git a/include/rtkDigisensGeometryXMLFileReader.h b/include/rtkDigisensGeometryXMLFileReader.h index 9e67aef1e..f5b8a13d7 100644 --- a/include/rtkDigisensGeometryXMLFileReader.h +++ b/include/rtkDigisensGeometryXMLFileReader.h @@ -42,11 +42,7 @@ namespace rtk class RTK_EXPORT DigisensGeometryXMLFileReader : public itk::XMLReader { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DigisensGeometryXMLFileReader); -#else ITK_DISALLOW_COPY_AND_MOVE(DigisensGeometryXMLFileReader); -#endif /** Standard type alias */ using Self = DigisensGeometryXMLFileReader; diff --git a/include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h b/include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h index c374318dd..b9a793562 100644 --- a/include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h +++ b/include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h @@ -42,11 +42,7 @@ class ITK_TEMPLATE_EXPORT DisplacedDetectorForOffsetFieldOfViewImageFilter : public rtk::DisplacedDetectorImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DisplacedDetectorForOffsetFieldOfViewImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DisplacedDetectorForOffsetFieldOfViewImageFilter); -#endif /** Standard class type alias. */ using Self = DisplacedDetectorForOffsetFieldOfViewImageFilter; diff --git a/include/rtkDisplacedDetectorImageFilter.h b/include/rtkDisplacedDetectorImageFilter.h index a1b8e7679..c273d30a6 100644 --- a/include/rtkDisplacedDetectorImageFilter.h +++ b/include/rtkDisplacedDetectorImageFilter.h @@ -60,11 +60,7 @@ template class ITK_TEMPLATE_EXPORT DisplacedDetectorImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DisplacedDetectorImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DisplacedDetectorImageFilter); -#endif /** Standard class type alias. */ using Self = DisplacedDetectorImageFilter; diff --git a/include/rtkDivergenceOfGradientConjugateGradientOperator.h b/include/rtkDivergenceOfGradientConjugateGradientOperator.h index 285406ce1..c9e0bd708 100644 --- a/include/rtkDivergenceOfGradientConjugateGradientOperator.h +++ b/include/rtkDivergenceOfGradientConjugateGradientOperator.h @@ -38,11 +38,7 @@ template class ITK_TEMPLATE_EXPORT DivergenceOfGradientConjugateGradientOperator : public ConjugateGradientOperator { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DivergenceOfGradientConjugateGradientOperator); -#else ITK_DISALLOW_COPY_AND_MOVE(DivergenceOfGradientConjugateGradientOperator); -#endif /** Extract dimension from input and output image. */ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); diff --git a/include/rtkDownsampleImageFilter.h b/include/rtkDownsampleImageFilter.h index 95cc1e9a6..885fe421b 100644 --- a/include/rtkDownsampleImageFilter.h +++ b/include/rtkDownsampleImageFilter.h @@ -38,11 +38,7 @@ template class ITK_TEMPLATE_EXPORT DownsampleImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DownsampleImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DownsampleImageFilter); -#endif /** Standard class type alias. */ using Self = DownsampleImageFilter; diff --git a/include/rtkDrawBoxImageFilter.h b/include/rtkDrawBoxImageFilter.h index 7985711ed..3eae7f2d3 100644 --- a/include/rtkDrawBoxImageFilter.h +++ b/include/rtkDrawBoxImageFilter.h @@ -39,11 +39,7 @@ template class ITK_TEMPLATE_EXPORT DrawBoxImageFilter : public DrawConvexImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DrawBoxImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DrawBoxImageFilter); -#endif /** Standard class type alias. */ using Self = DrawBoxImageFilter; diff --git a/include/rtkDrawConeImageFilter.h b/include/rtkDrawConeImageFilter.h index 5c1f75b7c..18a64a3c5 100644 --- a/include/rtkDrawConeImageFilter.h +++ b/include/rtkDrawConeImageFilter.h @@ -38,11 +38,7 @@ template class ITK_TEMPLATE_EXPORT DrawConeImageFilter : public DrawEllipsoidImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DrawConeImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DrawConeImageFilter); -#endif /** Standard class type alias. */ using Self = DrawConeImageFilter; diff --git a/include/rtkDrawConvexImageFilter.h b/include/rtkDrawConvexImageFilter.h index 458ee9d86..e8e6f50f3 100644 --- a/include/rtkDrawConvexImageFilter.h +++ b/include/rtkDrawConvexImageFilter.h @@ -42,11 +42,7 @@ template class ITK_TEMPLATE_EXPORT DrawConvexImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DrawConvexImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DrawConvexImageFilter); -#endif /** Standard class type alias. */ using Self = DrawConvexImageFilter; diff --git a/include/rtkDrawCylinderImageFilter.h b/include/rtkDrawCylinderImageFilter.h index 9f9f05db0..2838da77b 100644 --- a/include/rtkDrawCylinderImageFilter.h +++ b/include/rtkDrawCylinderImageFilter.h @@ -42,11 +42,7 @@ template class ITK_TEMPLATE_EXPORT DrawCylinderImageFilter : public DrawEllipsoidImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DrawCylinderImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DrawCylinderImageFilter); -#endif /** Standard class type alias. */ using Self = DrawCylinderImageFilter; diff --git a/include/rtkDrawEllipsoidImageFilter.h b/include/rtkDrawEllipsoidImageFilter.h index cf4809ef1..e0a72c05d 100644 --- a/include/rtkDrawEllipsoidImageFilter.h +++ b/include/rtkDrawEllipsoidImageFilter.h @@ -38,11 +38,7 @@ template class ITK_TEMPLATE_EXPORT DrawEllipsoidImageFilter : public DrawConvexImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DrawEllipsoidImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DrawEllipsoidImageFilter); -#endif /** Standard class type alias. */ using Self = DrawEllipsoidImageFilter; diff --git a/include/rtkDrawGeometricPhantomImageFilter.h b/include/rtkDrawGeometricPhantomImageFilter.h index fb68a2bc3..ae8e4fec4 100644 --- a/include/rtkDrawGeometricPhantomImageFilter.h +++ b/include/rtkDrawGeometricPhantomImageFilter.h @@ -39,11 +39,7 @@ template class ITK_TEMPLATE_EXPORT DrawGeometricPhantomImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DrawGeometricPhantomImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DrawGeometricPhantomImageFilter); -#endif /** Standard class type alias. */ using Self = DrawGeometricPhantomImageFilter; diff --git a/include/rtkDrawQuadricImageFilter.h b/include/rtkDrawQuadricImageFilter.h index b2a893267..4d954ff2e 100644 --- a/include/rtkDrawQuadricImageFilter.h +++ b/include/rtkDrawQuadricImageFilter.h @@ -38,11 +38,7 @@ template class ITK_TEMPLATE_EXPORT DrawQuadricImageFilter : public DrawConvexImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DrawQuadricImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DrawQuadricImageFilter); -#endif /** Standard class type alias. */ using Self = DrawQuadricImageFilter; diff --git a/include/rtkDrawSheppLoganFilter.h b/include/rtkDrawSheppLoganFilter.h index c4d9e4548..96d78b412 100644 --- a/include/rtkDrawSheppLoganFilter.h +++ b/include/rtkDrawSheppLoganFilter.h @@ -40,11 +40,7 @@ template class ITK_TEMPLATE_EXPORT DrawSheppLoganFilter : public DrawGeometricPhantomImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DrawSheppLoganFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(DrawSheppLoganFilter); -#endif /** Standard class type alias. */ using Self = DrawSheppLoganFilter; diff --git a/include/rtkDualEnergyNegativeLogLikelihood.h b/include/rtkDualEnergyNegativeLogLikelihood.h index 3ea63d311..a71e4bdee 100644 --- a/include/rtkDualEnergyNegativeLogLikelihood.h +++ b/include/rtkDualEnergyNegativeLogLikelihood.h @@ -43,11 +43,7 @@ namespace rtk class DualEnergyNegativeLogLikelihood : public rtk::ProjectionsDecompositionNegativeLogLikelihood { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(DualEnergyNegativeLogLikelihood); -#else ITK_DISALLOW_COPY_AND_MOVE(DualEnergyNegativeLogLikelihood); -#endif using Self = DualEnergyNegativeLogLikelihood; using Superclass = rtk::ProjectionsDecompositionNegativeLogLikelihood; diff --git a/include/rtkEdfImageIO.h b/include/rtkEdfImageIO.h index c631efae7..aefdd0d25 100644 --- a/include/rtkEdfImageIO.h +++ b/include/rtkEdfImageIO.h @@ -40,11 +40,7 @@ namespace rtk class RTK_EXPORT EdfImageIO : public itk::ImageIOBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(EdfImageIO); -#else ITK_DISALLOW_COPY_AND_MOVE(EdfImageIO); -#endif /** Standard class type alias. */ using Self = EdfImageIO; diff --git a/include/rtkEdfImageIOFactory.h b/include/rtkEdfImageIOFactory.h index 3c0e2ce8b..c3b05860f 100644 --- a/include/rtkEdfImageIOFactory.h +++ b/include/rtkEdfImageIOFactory.h @@ -38,11 +38,7 @@ namespace rtk class RTK_EXPORT EdfImageIOFactory : public itk::ObjectFactoryBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(EdfImageIOFactory); -#else ITK_DISALLOW_COPY_AND_MOVE(EdfImageIOFactory); -#endif /** Standard class type alias. */ using Self = EdfImageIOFactory; diff --git a/include/rtkEdfRawToAttenuationImageFilter.h b/include/rtkEdfRawToAttenuationImageFilter.h index a643f10d9..d82e2afb9 100644 --- a/include/rtkEdfRawToAttenuationImageFilter.h +++ b/include/rtkEdfRawToAttenuationImageFilter.h @@ -39,11 +39,7 @@ template class ITKIOImageBase_HIDDEN EdfRawToAttenuationImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(EdfRawToAttenuationImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(EdfRawToAttenuationImageFilter); -#endif /** Standard class type alias. */ using Self = EdfRawToAttenuationImageFilter; diff --git a/include/rtkElektaSynergyGeometryReader.h b/include/rtkElektaSynergyGeometryReader.h index a5f3e95c6..1407c2ec8 100644 --- a/include/rtkElektaSynergyGeometryReader.h +++ b/include/rtkElektaSynergyGeometryReader.h @@ -39,11 +39,7 @@ namespace rtk class RTK_EXPORT ElektaSynergyGeometryReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ElektaSynergyGeometryReader); -#else ITK_DISALLOW_COPY_AND_MOVE(ElektaSynergyGeometryReader); -#endif /** Standard type alias */ using Self = ElektaSynergyGeometryReader; diff --git a/include/rtkElektaSynergyLookupTableImageFilter.h b/include/rtkElektaSynergyLookupTableImageFilter.h index 5e4fd3ca4..9643a4456 100644 --- a/include/rtkElektaSynergyLookupTableImageFilter.h +++ b/include/rtkElektaSynergyLookupTableImageFilter.h @@ -43,11 +43,7 @@ class ITK_TEMPLATE_EXPORT ElektaSynergyLookupTableImageFilter : public LookupTableImageFilter, TOutputImage> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ElektaSynergyLookupTableImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ElektaSynergyLookupTableImageFilter); -#endif /** Standard class type alias. */ using Self = ElektaSynergyLookupTableImageFilter; diff --git a/include/rtkElektaSynergyRawLookupTableImageFilter.h b/include/rtkElektaSynergyRawLookupTableImageFilter.h index 02ad1ec70..e82d28b2b 100644 --- a/include/rtkElektaSynergyRawLookupTableImageFilter.h +++ b/include/rtkElektaSynergyRawLookupTableImageFilter.h @@ -44,11 +44,7 @@ class ITK_TEMPLATE_EXPORT ElektaSynergyRawLookupTableImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ElektaSynergyRawLookupTableImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ElektaSynergyRawLookupTableImageFilter); -#endif /** Standard class type alias. */ using Self = ElektaSynergyRawLookupTableImageFilter; diff --git a/include/rtkElektaXVI5GeometryXMLFile.h b/include/rtkElektaXVI5GeometryXMLFile.h index c0a0b437f..ff658b352 100644 --- a/include/rtkElektaXVI5GeometryXMLFile.h +++ b/include/rtkElektaXVI5GeometryXMLFile.h @@ -46,11 +46,7 @@ namespace rtk class RTK_EXPORT ElektaXVI5GeometryXMLFileReader : public itk::XMLReader { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ElektaXVI5GeometryXMLFileReader); -#else ITK_DISALLOW_COPY_AND_MOVE(ElektaXVI5GeometryXMLFileReader); -#endif /** Standard type alias */ using Self = ElektaXVI5GeometryXMLFileReader; diff --git a/include/rtkExtractPhaseImageFilter.h b/include/rtkExtractPhaseImageFilter.h index 404906ada..f3b235cac 100644 --- a/include/rtkExtractPhaseImageFilter.h +++ b/include/rtkExtractPhaseImageFilter.h @@ -47,11 +47,7 @@ template class ITK_TEMPLATE_EXPORT ExtractPhaseImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ExtractPhaseImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ExtractPhaseImageFilter); -#endif /** Standard class type alias. */ using Self = ExtractPhaseImageFilter; diff --git a/include/rtkFDKBackProjectionImageFilter.h b/include/rtkFDKBackProjectionImageFilter.h index 8b6fe9e5d..e16c394ab 100644 --- a/include/rtkFDKBackProjectionImageFilter.h +++ b/include/rtkFDKBackProjectionImageFilter.h @@ -39,11 +39,7 @@ template class ITK_TEMPLATE_EXPORT FDKBackProjectionImageFilter : public BackProjectionImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FDKBackProjectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FDKBackProjectionImageFilter); -#endif /** Standard class type alias. */ using Self = FDKBackProjectionImageFilter; diff --git a/include/rtkFDKConeBeamReconstructionFilter.h b/include/rtkFDKConeBeamReconstructionFilter.h index 6b7425297..adabb3e21 100644 --- a/include/rtkFDKConeBeamReconstructionFilter.h +++ b/include/rtkFDKConeBeamReconstructionFilter.h @@ -63,11 +63,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FDKConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FDKConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = FDKConeBeamReconstructionFilter; diff --git a/include/rtkFDKWarpBackProjectionImageFilter.h b/include/rtkFDKWarpBackProjectionImageFilter.h index 2c60e5fdf..043bc8171 100644 --- a/include/rtkFDKWarpBackProjectionImageFilter.h +++ b/include/rtkFDKWarpBackProjectionImageFilter.h @@ -47,11 +47,7 @@ class ITK_TEMPLATE_EXPORT FDKWarpBackProjectionImageFilter : public FDKBackProjectionImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FDKWarpBackProjectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FDKWarpBackProjectionImageFilter); -#endif /** Standard class type alias. */ using Self = FDKWarpBackProjectionImageFilter; diff --git a/include/rtkFDKWeightProjectionFilter.h b/include/rtkFDKWeightProjectionFilter.h index b119c26ab..e8bb2b2ec 100644 --- a/include/rtkFDKWeightProjectionFilter.h +++ b/include/rtkFDKWeightProjectionFilter.h @@ -51,11 +51,7 @@ template class ITK_TEMPLATE_EXPORT FDKWeightProjectionFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FDKWeightProjectionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FDKWeightProjectionFilter); -#endif /** Standard class type alias. */ using Self = FDKWeightProjectionFilter; diff --git a/include/rtkFFTProjectionsConvolutionImageFilter.h b/include/rtkFFTProjectionsConvolutionImageFilter.h index dd6765817..011c02623 100644 --- a/include/rtkFFTProjectionsConvolutionImageFilter.h +++ b/include/rtkFFTProjectionsConvolutionImageFilter.h @@ -46,11 +46,7 @@ class ITK_TEMPLATE_EXPORT FFTProjectionsConvolutionImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FFTProjectionsConvolutionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FFTProjectionsConvolutionImageFilter); -#endif /** Standard class type alias. */ using Self = FFTProjectionsConvolutionImageFilter; diff --git a/include/rtkFFTRampImageFilter.h b/include/rtkFFTRampImageFilter.h index f107c5ff4..5575e9d6b 100644 --- a/include/rtkFFTRampImageFilter.h +++ b/include/rtkFFTRampImageFilter.h @@ -62,11 +62,7 @@ class ITK_TEMPLATE_EXPORT FFTRampImageFilter : public rtk::FFTProjectionsConvolutionImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FFTRampImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FFTRampImageFilter); -#endif /** Standard class type alias. */ using Self = FFTRampImageFilter; diff --git a/include/rtkFieldOfViewImageFilter.h b/include/rtkFieldOfViewImageFilter.h index b62791279..46241087d 100644 --- a/include/rtkFieldOfViewImageFilter.h +++ b/include/rtkFieldOfViewImageFilter.h @@ -48,11 +48,7 @@ template class ITK_TEMPLATE_EXPORT FieldOfViewImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FieldOfViewImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FieldOfViewImageFilter); -#endif /** Standard class type alias. */ using Self = FieldOfViewImageFilter; diff --git a/include/rtkForbildPhantomFileReader.h b/include/rtkForbildPhantomFileReader.h index 491ff9e7e..a05f5b835 100644 --- a/include/rtkForbildPhantomFileReader.h +++ b/include/rtkForbildPhantomFileReader.h @@ -42,11 +42,7 @@ namespace rtk class RTK_EXPORT ForbildPhantomFileReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ForbildPhantomFileReader); -#else ITK_DISALLOW_COPY_AND_MOVE(ForbildPhantomFileReader); -#endif /** Standard class type alias. */ using Self = ForbildPhantomFileReader; diff --git a/include/rtkForwardDifferenceGradientImageFilter.h b/include/rtkForwardDifferenceGradientImageFilter.h index f45fcdbca..47534c5ab 100644 --- a/include/rtkForwardDifferenceGradientImageFilter.h +++ b/include/rtkForwardDifferenceGradientImageFilter.h @@ -56,11 +56,7 @@ class ITK_TEMPLATE_EXPORT ForwardDifferenceGradientImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ForwardDifferenceGradientImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ForwardDifferenceGradientImageFilter); -#endif /** Extract dimension from input image. */ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); diff --git a/include/rtkForwardProjectionImageFilter.h b/include/rtkForwardProjectionImageFilter.h index 821c0d342..4b2a65981 100644 --- a/include/rtkForwardProjectionImageFilter.h +++ b/include/rtkForwardProjectionImageFilter.h @@ -37,11 +37,7 @@ template class ITK_TEMPLATE_EXPORT ForwardProjectionImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ForwardProjectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ForwardProjectionImageFilter); -#endif /** Standard class type alias. */ using Self = ForwardProjectionImageFilter; diff --git a/include/rtkForwardWarpImageFilter.h b/include/rtkForwardWarpImageFilter.h index 868c39ad8..42e8aa0de 100644 --- a/include/rtkForwardWarpImageFilter.h +++ b/include/rtkForwardWarpImageFilter.h @@ -45,11 +45,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ForwardWarpImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ForwardWarpImageFilter); -#endif /** Standard class type alias. */ using Self = ForwardWarpImageFilter; diff --git a/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h b/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h index e657cef28..b28e59b0e 100644 --- a/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h @@ -97,11 +97,7 @@ class ITK_TEMPLATE_EXPORT FourDConjugateGradientConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FourDConjugateGradientConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FourDConjugateGradientConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = FourDConjugateGradientConeBeamReconstructionFilter; diff --git a/include/rtkFourDROOSTERConeBeamReconstructionFilter.h b/include/rtkFourDROOSTERConeBeamReconstructionFilter.h index eb612e2aa..87b19a896 100644 --- a/include/rtkFourDROOSTERConeBeamReconstructionFilter.h +++ b/include/rtkFourDROOSTERConeBeamReconstructionFilter.h @@ -208,11 +208,7 @@ class ITK_TEMPLATE_EXPORT FourDROOSTERConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FourDROOSTERConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FourDROOSTERConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = FourDROOSTERConeBeamReconstructionFilter; diff --git a/include/rtkFourDReconstructionConjugateGradientOperator.h b/include/rtkFourDReconstructionConjugateGradientOperator.h index e9574b5e3..c3417a05e 100644 --- a/include/rtkFourDReconstructionConjugateGradientOperator.h +++ b/include/rtkFourDReconstructionConjugateGradientOperator.h @@ -131,11 +131,7 @@ class ITK_TEMPLATE_EXPORT FourDReconstructionConjugateGradientOperator : public ConjugateGradientOperator { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FourDReconstructionConjugateGradientOperator); -#else ITK_DISALLOW_COPY_AND_MOVE(FourDReconstructionConjugateGradientOperator); -#endif /** Standard class type alias. */ using Self = FourDReconstructionConjugateGradientOperator; diff --git a/include/rtkFourDSARTConeBeamReconstructionFilter.h b/include/rtkFourDSARTConeBeamReconstructionFilter.h index b17d34678..0b95e66b6 100644 --- a/include/rtkFourDSARTConeBeamReconstructionFilter.h +++ b/include/rtkFourDSARTConeBeamReconstructionFilter.h @@ -123,11 +123,7 @@ class ITK_TEMPLATE_EXPORT FourDSARTConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FourDSARTConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FourDSARTConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = FourDSARTConeBeamReconstructionFilter; diff --git a/include/rtkFourDToProjectionStackImageFilter.h b/include/rtkFourDToProjectionStackImageFilter.h index 84d7e43e9..c8a468a84 100644 --- a/include/rtkFourDToProjectionStackImageFilter.h +++ b/include/rtkFourDToProjectionStackImageFilter.h @@ -101,11 +101,7 @@ class ITK_TEMPLATE_EXPORT FourDToProjectionStackImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(FourDToProjectionStackImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(FourDToProjectionStackImageFilter); -#endif /** Standard class type alias. */ using Self = FourDToProjectionStackImageFilter; diff --git a/include/rtkGeometricPhantom.h b/include/rtkGeometricPhantom.h index fe3f704ce..b1ec74cfa 100644 --- a/include/rtkGeometricPhantom.h +++ b/include/rtkGeometricPhantom.h @@ -37,11 +37,7 @@ namespace rtk class RTK_EXPORT GeometricPhantom : public itk::DataObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(GeometricPhantom); -#else ITK_DISALLOW_COPY_AND_MOVE(GeometricPhantom); -#endif /** Standard class type alias. */ using Self = GeometricPhantom; diff --git a/include/rtkGeometricPhantomFileReader.h b/include/rtkGeometricPhantomFileReader.h index a67b634a4..739414550 100644 --- a/include/rtkGeometricPhantomFileReader.h +++ b/include/rtkGeometricPhantomFileReader.h @@ -39,11 +39,7 @@ namespace rtk class RTK_EXPORT GeometricPhantomFileReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(GeometricPhantomFileReader); -#else ITK_DISALLOW_COPY_AND_MOVE(GeometricPhantomFileReader); -#endif /** Standard class type alias. */ using Self = GeometricPhantomFileReader; diff --git a/include/rtkGetNewtonUpdateImageFilter.h b/include/rtkGetNewtonUpdateImageFilter.h index 896c19c77..9c27d9078 100644 --- a/include/rtkGetNewtonUpdateImageFilter.h +++ b/include/rtkGetNewtonUpdateImageFilter.h @@ -45,11 +45,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(GetNewtonUpdateImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(GetNewtonUpdateImageFilter); -#endif /** Standard class type alias. */ using Self = GetNewtonUpdateImageFilter; diff --git a/include/rtkGlobalResourceProbe.h b/include/rtkGlobalResourceProbe.h index 17b190f3e..474d90775 100644 --- a/include/rtkGlobalResourceProbe.h +++ b/include/rtkGlobalResourceProbe.h @@ -36,11 +36,7 @@ namespace rtk class RTK_EXPORT GlobalResourceProbe : public itk::Object { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(GlobalResourceProbe); -#else ITK_DISALLOW_COPY_AND_MOVE(GlobalResourceProbe); -#endif /** Standard class type alias. */ using Self = GlobalResourceProbe; diff --git a/include/rtkHilbertImageFilter.h b/include/rtkHilbertImageFilter.h index c6158f7cb..cddcb1e07 100644 --- a/include/rtkHilbertImageFilter.h +++ b/include/rtkHilbertImageFilter.h @@ -44,11 +44,7 @@ template class ITK_TEMPLATE_EXPORT HilbertImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(HilbertImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(HilbertImageFilter); -#endif /** Standard class type alias. */ using Self = HilbertImageFilter; diff --git a/include/rtkHisImageIOFactory.h b/include/rtkHisImageIOFactory.h index 2d76909c0..c3d576ef4 100644 --- a/include/rtkHisImageIOFactory.h +++ b/include/rtkHisImageIOFactory.h @@ -41,11 +41,7 @@ namespace rtk class RTK_EXPORT HisImageIOFactory : public itk::ObjectFactoryBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(HisImageIOFactory); -#else ITK_DISALLOW_COPY_AND_MOVE(HisImageIOFactory); -#endif /** Standard class type alias. */ using Self = HisImageIOFactory; diff --git a/include/rtkHndImageIOFactory.h b/include/rtkHndImageIOFactory.h index 133835a45..6cfbca063 100644 --- a/include/rtkHndImageIOFactory.h +++ b/include/rtkHndImageIOFactory.h @@ -43,11 +43,7 @@ namespace rtk class RTK_EXPORT HndImageIOFactory : public itk::ObjectFactoryBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(HndImageIOFactory); -#else ITK_DISALLOW_COPY_AND_MOVE(HndImageIOFactory); -#endif /** Standard class type alias. */ using Self = HndImageIOFactory; diff --git a/include/rtkI0EstimationProjectionFilter.h b/include/rtkI0EstimationProjectionFilter.h index 702e8552a..bb48fdc94 100644 --- a/include/rtkI0EstimationProjectionFilter.h +++ b/include/rtkI0EstimationProjectionFilter.h @@ -46,11 +46,7 @@ template , class ITK_TEMPLATE_EXPORT I0EstimationProjectionFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(I0EstimationProjectionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(I0EstimationProjectionFilter); -#endif /** Standard class type alias. */ using Self = I0EstimationProjectionFilter; diff --git a/include/rtkImagXGeometryReader.h b/include/rtkImagXGeometryReader.h index f2eb53b8f..12794a0a5 100644 --- a/include/rtkImagXGeometryReader.h +++ b/include/rtkImagXGeometryReader.h @@ -41,11 +41,7 @@ template class ITK_TEMPLATE_EXPORT ImagXGeometryReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ImagXGeometryReader); -#else ITK_DISALLOW_COPY_AND_MOVE(ImagXGeometryReader); -#endif /** Standard type alias */ using Self = ImagXGeometryReader; diff --git a/include/rtkImagXImageIOFactory.h b/include/rtkImagXImageIOFactory.h index f58a5b5e9..1ed10bb8b 100644 --- a/include/rtkImagXImageIOFactory.h +++ b/include/rtkImagXImageIOFactory.h @@ -37,11 +37,7 @@ namespace rtk class RTK_EXPORT ImagXImageIOFactory : public itk::ObjectFactoryBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ImagXImageIOFactory); -#else ITK_DISALLOW_COPY_AND_MOVE(ImagXImageIOFactory); -#endif /** Standard class type alias. */ using Self = ImagXImageIOFactory; diff --git a/include/rtkImagXXMLFileReader.h b/include/rtkImagXXMLFileReader.h index f8b6f6233..edb215291 100644 --- a/include/rtkImagXXMLFileReader.h +++ b/include/rtkImagXXMLFileReader.h @@ -43,11 +43,7 @@ namespace rtk class RTK_EXPORT ImagXXMLFileReader : public itk::XMLReader { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ImagXXMLFileReader); -#else ITK_DISALLOW_COPY_AND_MOVE(ImagXXMLFileReader); -#endif /** Standard type alias */ using Self = ImagXXMLFileReader; diff --git a/include/rtkImageToVectorImageFilter.h b/include/rtkImageToVectorImageFilter.h index c04b09035..eb2f37bc3 100644 --- a/include/rtkImageToVectorImageFilter.h +++ b/include/rtkImageToVectorImageFilter.h @@ -47,11 +47,7 @@ template class ITK_TEMPLATE_EXPORT ImageToVectorImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ImageToVectorImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ImageToVectorImageFilter); -#endif /** Standard class type alias. */ using Self = ImageToVectorImageFilter; diff --git a/include/rtkImportImageFilter.h b/include/rtkImportImageFilter.h index 73e84d4b6..301ed93ff 100644 --- a/include/rtkImportImageFilter.h +++ b/include/rtkImportImageFilter.h @@ -44,11 +44,7 @@ template class ITK_TEMPLATE_EXPORT ImportImageFilter : public itk::ImageSource { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ImportImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ImportImageFilter); -#endif /** Typedef for the output image. */ using OutputImagePointer = typename TImage::Pointer; diff --git a/include/rtkInterpolatorWithKnownWeightsImageFilter.h b/include/rtkInterpolatorWithKnownWeightsImageFilter.h index 5bd712208..212224444 100644 --- a/include/rtkInterpolatorWithKnownWeightsImageFilter.h +++ b/include/rtkInterpolatorWithKnownWeightsImageFilter.h @@ -65,11 +65,7 @@ class ITK_TEMPLATE_EXPORT InterpolatorWithKnownWeightsImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(InterpolatorWithKnownWeightsImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(InterpolatorWithKnownWeightsImageFilter); -#endif /** Standard class type alias. */ using Self = InterpolatorWithKnownWeightsImageFilter; diff --git a/include/rtkIterativeConeBeamReconstructionFilter.h b/include/rtkIterativeConeBeamReconstructionFilter.h index 58c918c74..51d701369 100644 --- a/include/rtkIterativeConeBeamReconstructionFilter.h +++ b/include/rtkIterativeConeBeamReconstructionFilter.h @@ -58,11 +58,7 @@ class ITK_TEMPLATE_EXPORT IterativeConeBeamReconstructionFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(IterativeConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(IterativeConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = IterativeConeBeamReconstructionFilter; diff --git a/include/rtkIterativeFDKConeBeamReconstructionFilter.h b/include/rtkIterativeFDKConeBeamReconstructionFilter.h index 1f989c74e..3476ba7db 100644 --- a/include/rtkIterativeFDKConeBeamReconstructionFilter.h +++ b/include/rtkIterativeFDKConeBeamReconstructionFilter.h @@ -108,11 +108,7 @@ class ITK_TEMPLATE_EXPORT IterativeFDKConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(IterativeFDKConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(IterativeFDKConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = IterativeFDKConeBeamReconstructionFilter; diff --git a/include/rtkJosephBackAttenuatedProjectionImageFilter.h b/include/rtkJosephBackAttenuatedProjectionImageFilter.h index bbdac4399..57c9090a8 100644 --- a/include/rtkJosephBackAttenuatedProjectionImageFilter.h +++ b/include/rtkJosephBackAttenuatedProjectionImageFilter.h @@ -212,11 +212,7 @@ class ITK_TEMPLATE_EXPORT JosephBackAttenuatedProjectionImageFilter TSumAlongRay> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(JosephBackAttenuatedProjectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(JosephBackAttenuatedProjectionImageFilter); -#endif /** Standard class type alias. */ using Self = JosephBackAttenuatedProjectionImageFilter; diff --git a/include/rtkJosephBackProjectionImageFilter.h b/include/rtkJosephBackProjectionImageFilter.h index cfe6de487..ad7281f58 100644 --- a/include/rtkJosephBackProjectionImageFilter.h +++ b/include/rtkJosephBackProjectionImageFilter.h @@ -164,11 +164,7 @@ template < class ITK_TEMPLATE_EXPORT JosephBackProjectionImageFilter : public BackProjectionImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(JosephBackProjectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(JosephBackProjectionImageFilter); -#endif /** Standard class type alias. */ using Self = JosephBackProjectionImageFilter; diff --git a/include/rtkJosephForwardAttenuatedProjectionImageFilter.h b/include/rtkJosephForwardAttenuatedProjectionImageFilter.h index 1f233feb3..9715d2eb5 100644 --- a/include/rtkJosephForwardAttenuatedProjectionImageFilter.h +++ b/include/rtkJosephForwardAttenuatedProjectionImageFilter.h @@ -270,11 +270,7 @@ class ITK_TEMPLATE_EXPORT JosephForwardAttenuatedProjectionImageFilter TSumAlongRay> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(JosephForwardAttenuatedProjectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(JosephForwardAttenuatedProjectionImageFilter); -#endif /** Standard class type alias. */ using Self = JosephForwardAttenuatedProjectionImageFilter; diff --git a/include/rtkJosephForwardProjectionImageFilter.h b/include/rtkJosephForwardProjectionImageFilter.h index e56d6ee7a..33acf824b 100644 --- a/include/rtkJosephForwardProjectionImageFilter.h +++ b/include/rtkJosephForwardProjectionImageFilter.h @@ -171,11 +171,7 @@ class ITK_TEMPLATE_EXPORT JosephForwardProjectionImageFilter : public ForwardProjectionImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(JosephForwardProjectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(JosephForwardProjectionImageFilter); -#endif /** Standard class type alias. */ using Self = JosephForwardProjectionImageFilter; diff --git a/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h b/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h index bcf0c422f..1fc863a1f 100644 --- a/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h +++ b/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h @@ -79,11 +79,7 @@ class ITK_TEMPLATE_EXPORT LUTbasedVariableI0RawToAttenuationImageFilter : public LookupTableImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(LUTbasedVariableI0RawToAttenuationImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(LUTbasedVariableI0RawToAttenuationImageFilter); -#endif /** Standard class type alias. */ using Self = LUTbasedVariableI0RawToAttenuationImageFilter; diff --git a/include/rtkLagCorrectionImageFilter.h b/include/rtkLagCorrectionImageFilter.h index 0c4896e4c..39d1329b3 100644 --- a/include/rtkLagCorrectionImageFilter.h +++ b/include/rtkLagCorrectionImageFilter.h @@ -55,11 +55,7 @@ template class ITK_TEMPLATE_EXPORT LagCorrectionImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(LagCorrectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(LagCorrectionImageFilter); -#endif /** Standard class type alias. */ using Self = LagCorrectionImageFilter; diff --git a/include/rtkLaplacianImageFilter.h b/include/rtkLaplacianImageFilter.h index f6e60f540..948a3ef52 100644 --- a/include/rtkLaplacianImageFilter.h +++ b/include/rtkLaplacianImageFilter.h @@ -41,11 +41,7 @@ template class ITK_TEMPLATE_EXPORT LaplacianImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(LaplacianImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(LaplacianImageFilter); -#endif /** Standard class type alias. */ using Self = LaplacianImageFilter; diff --git a/include/rtkLastDimensionL0GradientDenoisingImageFilter.h b/include/rtkLastDimensionL0GradientDenoisingImageFilter.h index 32c6ecb39..5f3cd14f6 100644 --- a/include/rtkLastDimensionL0GradientDenoisingImageFilter.h +++ b/include/rtkLastDimensionL0GradientDenoisingImageFilter.h @@ -44,11 +44,7 @@ class ITK_TEMPLATE_EXPORT LastDimensionL0GradientDenoisingImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(LastDimensionL0GradientDenoisingImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(LastDimensionL0GradientDenoisingImageFilter); -#endif /** Standard class type alias. */ using Self = LastDimensionL0GradientDenoisingImageFilter; diff --git a/include/rtkLookupTableImageFilter.h b/include/rtkLookupTableImageFilter.h index ad56c5617..d1c862f43 100644 --- a/include/rtkLookupTableImageFilter.h +++ b/include/rtkLookupTableImageFilter.h @@ -147,11 +147,7 @@ class ITK_TEMPLATE_EXPORT LookupTableImageFilter Functor::LUT> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(LookupTableImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(LookupTableImageFilter); -#endif /** Lookup table type definition. */ using FunctorType = Functor::LUT; diff --git a/include/rtkMagnitudeThresholdImageFilter.h b/include/rtkMagnitudeThresholdImageFilter.h index 2ee0d4e1b..e66061818 100644 --- a/include/rtkMagnitudeThresholdImageFilter.h +++ b/include/rtkMagnitudeThresholdImageFilter.h @@ -40,11 +40,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(MagnitudeThresholdImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(MagnitudeThresholdImageFilter); -#endif /** Standard class type alias. */ using Self = MagnitudeThresholdImageFilter; diff --git a/include/rtkMaskCollimationImageFilter.h b/include/rtkMaskCollimationImageFilter.h index cf197c38b..541dc2b4b 100644 --- a/include/rtkMaskCollimationImageFilter.h +++ b/include/rtkMaskCollimationImageFilter.h @@ -40,11 +40,7 @@ template class ITK_TEMPLATE_EXPORT MaskCollimationImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(MaskCollimationImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(MaskCollimationImageFilter); -#endif /** Standard class type alias. */ using Self = MaskCollimationImageFilter; diff --git a/include/rtkMechlemOneStepSpectralReconstructionFilter.h b/include/rtkMechlemOneStepSpectralReconstructionFilter.h index 1e2bed32e..137872a25 100644 --- a/include/rtkMechlemOneStepSpectralReconstructionFilter.h +++ b/include/rtkMechlemOneStepSpectralReconstructionFilter.h @@ -147,11 +147,7 @@ class ITK_TEMPLATE_EXPORT MechlemOneStepSpectralReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(MechlemOneStepSpectralReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(MechlemOneStepSpectralReconstructionFilter); -#endif /** Standard class type alias. */ using Self = MechlemOneStepSpectralReconstructionFilter; diff --git a/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h b/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h index d8a41fd86..f061976f6 100644 --- a/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h @@ -71,11 +71,7 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDConjugateGradientConeBeamReconst : public rtk::FourDConjugateGradientConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter; diff --git a/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h b/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h index a341546ba..688c9449c 100644 --- a/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h +++ b/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h @@ -140,11 +140,7 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDROOSTERConeBeamReconstructionFil : public rtk::FourDROOSTERConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = MotionCompensatedFourDROOSTERConeBeamReconstructionFilter; diff --git a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h index bc6542388..243456d85 100644 --- a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h +++ b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h @@ -101,11 +101,7 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDReconstructionConjugateGradientO : public FourDReconstructionConjugateGradientOperator { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(MotionCompensatedFourDReconstructionConjugateGradientOperator); -#else ITK_DISALLOW_COPY_AND_MOVE(MotionCompensatedFourDReconstructionConjugateGradientOperator); -#endif /** Standard class type alias. */ using Self = MotionCompensatedFourDReconstructionConjugateGradientOperator; diff --git a/include/rtkMultiplyByVectorImageFilter.h b/include/rtkMultiplyByVectorImageFilter.h index 3c836fd02..c29414004 100644 --- a/include/rtkMultiplyByVectorImageFilter.h +++ b/include/rtkMultiplyByVectorImageFilter.h @@ -40,11 +40,7 @@ template class ITK_TEMPLATE_EXPORT MultiplyByVectorImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(MultiplyByVectorImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(MultiplyByVectorImageFilter); -#endif /** Standard class type alias. */ using Self = MultiplyByVectorImageFilter; diff --git a/include/rtkNesterovUpdateImageFilter.h b/include/rtkNesterovUpdateImageFilter.h index 8a115eb50..5053e77ab 100644 --- a/include/rtkNesterovUpdateImageFilter.h +++ b/include/rtkNesterovUpdateImageFilter.h @@ -42,11 +42,7 @@ template class ITK_TEMPLATE_EXPORT NesterovUpdateImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(NesterovUpdateImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(NesterovUpdateImageFilter); -#endif /** Standard class type alias. */ using Self = NesterovUpdateImageFilter; diff --git a/include/rtkOSEMConeBeamReconstructionFilter.h b/include/rtkOSEMConeBeamReconstructionFilter.h index da5ada22f..169bc7210 100644 --- a/include/rtkOSEMConeBeamReconstructionFilter.h +++ b/include/rtkOSEMConeBeamReconstructionFilter.h @@ -119,11 +119,7 @@ class ITK_TEMPLATE_EXPORT OSEMConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(OSEMConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(OSEMConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = OSEMConeBeamReconstructionFilter; diff --git a/include/rtkOraGeometryReader.h b/include/rtkOraGeometryReader.h index f637ee5ce..08256877a 100644 --- a/include/rtkOraGeometryReader.h +++ b/include/rtkOraGeometryReader.h @@ -39,11 +39,7 @@ namespace rtk class RTK_EXPORT OraGeometryReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(OraGeometryReader); -#else ITK_DISALLOW_COPY_AND_MOVE(OraGeometryReader); -#endif /** Standard type alias */ using Self = OraGeometryReader; diff --git a/include/rtkOraImageIOFactory.h b/include/rtkOraImageIOFactory.h index 8455aa38a..f58843858 100644 --- a/include/rtkOraImageIOFactory.h +++ b/include/rtkOraImageIOFactory.h @@ -40,11 +40,7 @@ namespace rtk class RTK_EXPORT OraImageIOFactory : public itk::ObjectFactoryBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(OraImageIOFactory); -#else ITK_DISALLOW_COPY_AND_MOVE(OraImageIOFactory); -#endif /** Standard class type alias. */ using Self = OraImageIOFactory; diff --git a/include/rtkOraLookupTableImageFilter.h b/include/rtkOraLookupTableImageFilter.h index e575682ae..d2f0c21e2 100644 --- a/include/rtkOraLookupTableImageFilter.h +++ b/include/rtkOraLookupTableImageFilter.h @@ -43,11 +43,7 @@ class ITK_TEMPLATE_EXPORT OraLookupTableImageFilter : public LookupTableImageFilter, TOutputImage> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(OraLookupTableImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(OraLookupTableImageFilter); -#endif /** Standard class type alias. */ using Self = OraLookupTableImageFilter; diff --git a/include/rtkOraXMLFileReader.h b/include/rtkOraXMLFileReader.h index 2ce913bb5..7122f538d 100644 --- a/include/rtkOraXMLFileReader.h +++ b/include/rtkOraXMLFileReader.h @@ -40,11 +40,7 @@ namespace rtk class RTK_EXPORT OraXMLFileReader : public itk::XMLReader { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(OraXMLFileReader); -#else ITK_DISALLOW_COPY_AND_MOVE(OraXMLFileReader); -#endif /** Standard type alias */ using Self = OraXMLFileReader; diff --git a/include/rtkParkerShortScanImageFilter.h b/include/rtkParkerShortScanImageFilter.h index b12d87874..32e6aa5d6 100644 --- a/include/rtkParkerShortScanImageFilter.h +++ b/include/rtkParkerShortScanImageFilter.h @@ -47,11 +47,7 @@ template class ITK_TEMPLATE_EXPORT ParkerShortScanImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ParkerShortScanImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ParkerShortScanImageFilter); -#endif /** Standard class type alias. */ using Self = ParkerShortScanImageFilter; diff --git a/include/rtkPhaseGatingImageFilter.h b/include/rtkPhaseGatingImageFilter.h index d394cedfe..a66060c7b 100644 --- a/include/rtkPhaseGatingImageFilter.h +++ b/include/rtkPhaseGatingImageFilter.h @@ -34,11 +34,7 @@ template class ITK_TEMPLATE_EXPORT PhaseGatingImageFilter : public SubSelectImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(PhaseGatingImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(PhaseGatingImageFilter); -#endif /** Standard class type alias. */ using Self = PhaseGatingImageFilter; diff --git a/include/rtkPhaseReader.h b/include/rtkPhaseReader.h index 5a7a00cf1..08ba94c33 100644 --- a/include/rtkPhaseReader.h +++ b/include/rtkPhaseReader.h @@ -35,11 +35,7 @@ namespace rtk class RTK_EXPORT PhaseReader : public itk::CSVFileReaderBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(PhaseReader); -#else ITK_DISALLOW_COPY_AND_MOVE(PhaseReader); -#endif /** Standard class type alias */ using Self = PhaseReader; diff --git a/include/rtkPhasesToInterpolationWeights.h b/include/rtkPhasesToInterpolationWeights.h index 83c1591b7..c26fedb47 100644 --- a/include/rtkPhasesToInterpolationWeights.h +++ b/include/rtkPhasesToInterpolationWeights.h @@ -40,11 +40,7 @@ namespace rtk class RTK_EXPORT PhasesToInterpolationWeights : public itk::CSVFileReaderBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(PhasesToInterpolationWeights); -#else ITK_DISALLOW_COPY_AND_MOVE(PhasesToInterpolationWeights); -#endif /** Standard class type alias */ using Self = PhasesToInterpolationWeights; diff --git a/include/rtkPolynomialGainCorrectionImageFilter.h b/include/rtkPolynomialGainCorrectionImageFilter.h index b0b9dabea..55f163400 100644 --- a/include/rtkPolynomialGainCorrectionImageFilter.h +++ b/include/rtkPolynomialGainCorrectionImageFilter.h @@ -45,11 +45,7 @@ class ITK_TEMPLATE_EXPORT PolynomialGainCorrectionImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(PolynomialGainCorrectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(PolynomialGainCorrectionImageFilter); -#endif /** Standard class type alias. */ using Self = PolynomialGainCorrectionImageFilter; diff --git a/include/rtkProjectGeometricPhantomImageFilter.h b/include/rtkProjectGeometricPhantomImageFilter.h index f3bac587a..ee5653f93 100644 --- a/include/rtkProjectGeometricPhantomImageFilter.h +++ b/include/rtkProjectGeometricPhantomImageFilter.h @@ -40,11 +40,7 @@ template class ITK_TEMPLATE_EXPORT ProjectGeometricPhantomImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ProjectGeometricPhantomImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ProjectGeometricPhantomImageFilter); -#endif /** Standard class type alias. */ using Self = ProjectGeometricPhantomImageFilter; diff --git a/include/rtkProjectionGeometry.h b/include/rtkProjectionGeometry.h index a12c9bd0e..9956fc611 100644 --- a/include/rtkProjectionGeometry.h +++ b/include/rtkProjectionGeometry.h @@ -44,11 +44,7 @@ template class ITK_TEMPLATE_EXPORT ProjectionGeometry : public itk::DataObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ProjectionGeometry); -#else ITK_DISALLOW_COPY_AND_MOVE(ProjectionGeometry); -#endif using Self = ProjectionGeometry; using Superclass = itk::DataObject; diff --git a/include/rtkProjectionStackToFourDImageFilter.h b/include/rtkProjectionStackToFourDImageFilter.h index fd42627c2..a6ef0ff30 100644 --- a/include/rtkProjectionStackToFourDImageFilter.h +++ b/include/rtkProjectionStackToFourDImageFilter.h @@ -106,11 +106,7 @@ class ITK_TEMPLATE_EXPORT ProjectionStackToFourDImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ProjectionStackToFourDImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ProjectionStackToFourDImageFilter); -#endif /** Standard class type alias. */ using Self = ProjectionStackToFourDImageFilter; diff --git a/include/rtkProjectionsDecompositionNegativeLogLikelihood.h b/include/rtkProjectionsDecompositionNegativeLogLikelihood.h index ceba7dd99..18f8dcb73 100644 --- a/include/rtkProjectionsDecompositionNegativeLogLikelihood.h +++ b/include/rtkProjectionsDecompositionNegativeLogLikelihood.h @@ -39,11 +39,7 @@ namespace rtk class ProjectionsDecompositionNegativeLogLikelihood : public itk::SingleValuedCostFunction { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ProjectionsDecompositionNegativeLogLikelihood); -#else ITK_DISALLOW_COPY_AND_MOVE(ProjectionsDecompositionNegativeLogLikelihood); -#endif using Self = ProjectionsDecompositionNegativeLogLikelihood; using Superclass = itk::SingleValuedCostFunction; diff --git a/include/rtkProjectionsReader.h b/include/rtkProjectionsReader.h index 104a9c459..f1eac14f4 100644 --- a/include/rtkProjectionsReader.h +++ b/include/rtkProjectionsReader.h @@ -125,11 +125,7 @@ template class ITK_TEMPLATE_EXPORT ProjectionsReader : public itk::ImageSource { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ProjectionsReader); -#else ITK_DISALLOW_COPY_AND_MOVE(ProjectionsReader); -#endif /** Standard class type alias. */ using Self = ProjectionsReader; diff --git a/include/rtkRayBoxIntersectionImageFilter.h b/include/rtkRayBoxIntersectionImageFilter.h index 4eb08c7b0..7a204c625 100644 --- a/include/rtkRayBoxIntersectionImageFilter.h +++ b/include/rtkRayBoxIntersectionImageFilter.h @@ -40,11 +40,7 @@ class ITK_TEMPLATE_EXPORT RayBoxIntersectionImageFilter : public RayConvexIntersectionImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(RayBoxIntersectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(RayBoxIntersectionImageFilter); -#endif /** Standard class type alias. */ using Self = RayBoxIntersectionImageFilter; diff --git a/include/rtkRayConvexIntersectionImageFilter.h b/include/rtkRayConvexIntersectionImageFilter.h index ea519c05d..eb669b706 100644 --- a/include/rtkRayConvexIntersectionImageFilter.h +++ b/include/rtkRayConvexIntersectionImageFilter.h @@ -40,11 +40,7 @@ template class ITK_TEMPLATE_EXPORT RayConvexIntersectionImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(RayConvexIntersectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(RayConvexIntersectionImageFilter); -#endif /** Standard class type alias. */ using Self = RayConvexIntersectionImageFilter; diff --git a/include/rtkRayEllipsoidIntersectionImageFilter.h b/include/rtkRayEllipsoidIntersectionImageFilter.h index a816a882d..134534b1e 100644 --- a/include/rtkRayEllipsoidIntersectionImageFilter.h +++ b/include/rtkRayEllipsoidIntersectionImageFilter.h @@ -44,11 +44,7 @@ class ITK_TEMPLATE_EXPORT RayEllipsoidIntersectionImageFilter : public RayConvexIntersectionImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(RayEllipsoidIntersectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(RayEllipsoidIntersectionImageFilter); -#endif /** Standard class type alias. */ using Self = RayEllipsoidIntersectionImageFilter; diff --git a/include/rtkRayQuadricIntersectionImageFilter.h b/include/rtkRayQuadricIntersectionImageFilter.h index 2b7ccf312..092fb0e5e 100644 --- a/include/rtkRayQuadricIntersectionImageFilter.h +++ b/include/rtkRayQuadricIntersectionImageFilter.h @@ -39,11 +39,7 @@ class ITK_TEMPLATE_EXPORT RayQuadricIntersectionImageFilter : public RayConvexIntersectionImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(RayQuadricIntersectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(RayQuadricIntersectionImageFilter); -#endif /** Standard class type alias. */ using Self = RayQuadricIntersectionImageFilter; diff --git a/include/rtkReconstructImageFilter.h b/include/rtkReconstructImageFilter.h index 665a61ed5..1130180c5 100644 --- a/include/rtkReconstructImageFilter.h +++ b/include/rtkReconstructImageFilter.h @@ -123,11 +123,7 @@ template class ITK_TEMPLATE_EXPORT ReconstructImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ReconstructImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ReconstructImageFilter); -#endif /** Standard class type alias. */ using Self = ReconstructImageFilter; diff --git a/include/rtkReconstructionConjugateGradientOperator.h b/include/rtkReconstructionConjugateGradientOperator.h index e15378257..0c95b9061 100644 --- a/include/rtkReconstructionConjugateGradientOperator.h +++ b/include/rtkReconstructionConjugateGradientOperator.h @@ -118,11 +118,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ReconstructionConjugateGradientOperator); -#else ITK_DISALLOW_COPY_AND_MOVE(ReconstructionConjugateGradientOperator); -#endif /** Standard class type alias. */ using Self = ReconstructionConjugateGradientOperator; diff --git a/include/rtkReg1DExtractShroudSignalImageFilter.h b/include/rtkReg1DExtractShroudSignalImageFilter.h index 6573e0a23..94a2f27c1 100644 --- a/include/rtkReg1DExtractShroudSignalImageFilter.h +++ b/include/rtkReg1DExtractShroudSignalImageFilter.h @@ -39,11 +39,7 @@ class ITK_TEMPLATE_EXPORT Reg1DExtractShroudSignalImageFilter : public itk::ImageToImageFilter, itk::Image> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(Reg1DExtractShroudSignalImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(Reg1DExtractShroudSignalImageFilter); -#endif /** Standard class type alias. */ using TInputImage = itk::Image; diff --git a/include/rtkReg23ProjectionGeometry.h b/include/rtkReg23ProjectionGeometry.h index 27fa9547d..11b7478b8 100644 --- a/include/rtkReg23ProjectionGeometry.h +++ b/include/rtkReg23ProjectionGeometry.h @@ -63,11 +63,7 @@ namespace rtk class RTK_EXPORT Reg23ProjectionGeometry : public rtk::ThreeDCircularProjectionGeometry { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(Reg23ProjectionGeometry); -#else ITK_DISALLOW_COPY_AND_MOVE(Reg23ProjectionGeometry); -#endif /** General type alias **/ using Self = Reg23ProjectionGeometry; diff --git a/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h b/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h index 9fb5c012a..bb91f1f18 100644 --- a/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h @@ -108,11 +108,7 @@ class ITK_TEMPLATE_EXPORT RegularizedConjugateGradientConeBeamReconstructionFilt : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(RegularizedConjugateGradientConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(RegularizedConjugateGradientConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = RegularizedConjugateGradientConeBeamReconstructionFilter; diff --git a/include/rtkReorderProjectionsImageFilter.h b/include/rtkReorderProjectionsImageFilter.h index 7d1200a4c..b52e2f2a4 100644 --- a/include/rtkReorderProjectionsImageFilter.h +++ b/include/rtkReorderProjectionsImageFilter.h @@ -45,11 +45,7 @@ template class ITK_TEMPLATE_EXPORT ReorderProjectionsImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ReorderProjectionsImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ReorderProjectionsImageFilter); -#endif /** Standard class type alias. */ using Self = ReorderProjectionsImageFilter; diff --git a/include/rtkSARTConeBeamReconstructionFilter.h b/include/rtkSARTConeBeamReconstructionFilter.h index e15e98f93..22aa4df3e 100644 --- a/include/rtkSARTConeBeamReconstructionFilter.h +++ b/include/rtkSARTConeBeamReconstructionFilter.h @@ -136,11 +136,7 @@ class ITK_TEMPLATE_EXPORT SARTConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SARTConeBeamReconstructionFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SARTConeBeamReconstructionFilter); -#endif /** Standard class type alias. */ using Self = SARTConeBeamReconstructionFilter; diff --git a/include/rtkScatterGlareCorrectionImageFilter.h b/include/rtkScatterGlareCorrectionImageFilter.h index b3d8c65be..41de15429 100644 --- a/include/rtkScatterGlareCorrectionImageFilter.h +++ b/include/rtkScatterGlareCorrectionImageFilter.h @@ -43,11 +43,7 @@ class ITK_TEMPLATE_EXPORT ScatterGlareCorrectionImageFilter : public rtk::FFTProjectionsConvolutionImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ScatterGlareCorrectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(ScatterGlareCorrectionImageFilter); -#endif /** Standard class type alias. */ using Self = ScatterGlareCorrectionImageFilter; diff --git a/include/rtkSchlomka2008NegativeLogLikelihood.h b/include/rtkSchlomka2008NegativeLogLikelihood.h index 249e4d305..ce229c61f 100644 --- a/include/rtkSchlomka2008NegativeLogLikelihood.h +++ b/include/rtkSchlomka2008NegativeLogLikelihood.h @@ -45,11 +45,7 @@ namespace rtk class Schlomka2008NegativeLogLikelihood : public rtk::ProjectionsDecompositionNegativeLogLikelihood { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(Schlomka2008NegativeLogLikelihood); -#else ITK_DISALLOW_COPY_AND_MOVE(Schlomka2008NegativeLogLikelihood); -#endif using Self = Schlomka2008NegativeLogLikelihood; using Superclass = rtk::ProjectionsDecompositionNegativeLogLikelihood; diff --git a/include/rtkSelectOneProjectionPerCycleImageFilter.h b/include/rtkSelectOneProjectionPerCycleImageFilter.h index 2906eb223..a152dba74 100644 --- a/include/rtkSelectOneProjectionPerCycleImageFilter.h +++ b/include/rtkSelectOneProjectionPerCycleImageFilter.h @@ -39,11 +39,7 @@ template class ITK_TEMPLATE_EXPORT SelectOneProjectionPerCycleImageFilter : public SubSelectImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SelectOneProjectionPerCycleImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SelectOneProjectionPerCycleImageFilter); -#endif /** Standard class type alias. */ using Self = SelectOneProjectionPerCycleImageFilter; diff --git a/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h b/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h index e694d1921..d1a131035 100644 --- a/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h +++ b/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h @@ -45,11 +45,7 @@ class ITK_TEMPLATE_EXPORT SeparableQuadraticSurrogateRegularizationImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SeparableQuadraticSurrogateRegularizationImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SeparableQuadraticSurrogateRegularizationImageFilter); -#endif /** Standard class type alias. */ using Self = SeparableQuadraticSurrogateRegularizationImageFilter; diff --git a/include/rtkSheppLoganPhantom.h b/include/rtkSheppLoganPhantom.h index cfd1a15d7..85b092437 100644 --- a/include/rtkSheppLoganPhantom.h +++ b/include/rtkSheppLoganPhantom.h @@ -41,11 +41,7 @@ namespace rtk class RTK_EXPORT SheppLoganPhantom : public GeometricPhantom { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SheppLoganPhantom); -#else ITK_DISALLOW_COPY_AND_MOVE(SheppLoganPhantom); -#endif /** Standard class type alias. */ using Self = SheppLoganPhantom; diff --git a/include/rtkSheppLoganPhantomFilter.h b/include/rtkSheppLoganPhantomFilter.h index 61d87c09c..d95873045 100644 --- a/include/rtkSheppLoganPhantomFilter.h +++ b/include/rtkSheppLoganPhantomFilter.h @@ -40,11 +40,7 @@ template class ITK_TEMPLATE_EXPORT SheppLoganPhantomFilter : public ProjectGeometricPhantomImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SheppLoganPhantomFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SheppLoganPhantomFilter); -#endif /** Standard class type alias. */ using Self = SheppLoganPhantomFilter; diff --git a/include/rtkSignalToInterpolationWeights.h b/include/rtkSignalToInterpolationWeights.h index 2c10f0723..f250f5e1b 100644 --- a/include/rtkSignalToInterpolationWeights.h +++ b/include/rtkSignalToInterpolationWeights.h @@ -40,11 +40,7 @@ namespace rtk class RTK_EXPORT SignalToInterpolationWeights : public itk::CSVFileReaderBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SignalToInterpolationWeights); -#else ITK_DISALLOW_COPY_AND_MOVE(SignalToInterpolationWeights); -#endif /** Standard class type alias */ using Self = SignalToInterpolationWeights; diff --git a/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h b/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h index 9b86a54c9..bc6c793fd 100644 --- a/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h +++ b/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h @@ -46,11 +46,7 @@ class ITK_TEMPLATE_EXPORT SimplexSpectralProjectionsDecompositionImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SimplexSpectralProjectionsDecompositionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SimplexSpectralProjectionsDecompositionImageFilter); -#endif /** Standard class type alias. */ using Self = SimplexSpectralProjectionsDecompositionImageFilter; diff --git a/include/rtkSingularValueThresholdImageFilter.h b/include/rtkSingularValueThresholdImageFilter.h index e9bdb3f8d..75a3d5dd0 100644 --- a/include/rtkSingularValueThresholdImageFilter.h +++ b/include/rtkSingularValueThresholdImageFilter.h @@ -50,11 +50,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SingularValueThresholdImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SingularValueThresholdImageFilter); -#endif /** Standard class type alias. */ using Self = SingularValueThresholdImageFilter; diff --git a/include/rtkSoftThresholdImageFilter.h b/include/rtkSoftThresholdImageFilter.h index abe3979bd..957114bd8 100644 --- a/include/rtkSoftThresholdImageFilter.h +++ b/include/rtkSoftThresholdImageFilter.h @@ -87,11 +87,7 @@ class ITK_TEMPLATE_EXPORT SoftThresholdImageFilter Functor::SoftThreshold> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SoftThresholdImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SoftThresholdImageFilter); -#endif /** Standard class type alias. */ using Self = SoftThresholdImageFilter; diff --git a/include/rtkSoftThresholdTVImageFilter.h b/include/rtkSoftThresholdTVImageFilter.h index adfc70e82..7a8bf0b22 100644 --- a/include/rtkSoftThresholdTVImageFilter.h +++ b/include/rtkSoftThresholdTVImageFilter.h @@ -45,11 +45,7 @@ template class ITK_TEMPLATE_EXPORT SoftThresholdTVImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SoftThresholdTVImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SoftThresholdTVImageFilter); -#endif /** Standard class type alias. */ using Self = SoftThresholdTVImageFilter; diff --git a/include/rtkSpectralForwardModelImageFilter.h b/include/rtkSpectralForwardModelImageFilter.h index 970414b1f..4100ab0b3 100644 --- a/include/rtkSpectralForwardModelImageFilter.h +++ b/include/rtkSpectralForwardModelImageFilter.h @@ -48,11 +48,7 @@ class ITK_TEMPLATE_EXPORT SpectralForwardModelImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SpectralForwardModelImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SpectralForwardModelImageFilter); -#endif /** Standard class type alias. */ using Self = SpectralForwardModelImageFilter; diff --git a/include/rtkSplatWithKnownWeightsImageFilter.h b/include/rtkSplatWithKnownWeightsImageFilter.h index 1f77d0c8b..b6d31a1db 100644 --- a/include/rtkSplatWithKnownWeightsImageFilter.h +++ b/include/rtkSplatWithKnownWeightsImageFilter.h @@ -68,11 +68,7 @@ class ITK_TEMPLATE_EXPORT SplatWithKnownWeightsImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SplatWithKnownWeightsImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SplatWithKnownWeightsImageFilter); -#endif /** Standard class type alias. */ using Self = SplatWithKnownWeightsImageFilter; diff --git a/include/rtkSubSelectFromListImageFilter.h b/include/rtkSubSelectFromListImageFilter.h index 8490bcabf..027bbd558 100644 --- a/include/rtkSubSelectFromListImageFilter.h +++ b/include/rtkSubSelectFromListImageFilter.h @@ -33,11 +33,7 @@ template class ITK_TEMPLATE_EXPORT SubSelectFromListImageFilter : public SubSelectImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SubSelectFromListImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SubSelectFromListImageFilter); -#endif /** Standard class type alias. */ using Self = SubSelectFromListImageFilter; diff --git a/include/rtkSubSelectImageFilter.h b/include/rtkSubSelectImageFilter.h index 7aaa3a153..68f3affb2 100644 --- a/include/rtkSubSelectImageFilter.h +++ b/include/rtkSubSelectImageFilter.h @@ -65,11 +65,7 @@ class ITK_TEMPLATE_EXPORT SubSelectImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SubSelectImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SubSelectImageFilter); -#endif /** Standard class type alias. */ using Self = SubSelectImageFilter; diff --git a/include/rtkSumOfSquaresImageFilter.h b/include/rtkSumOfSquaresImageFilter.h index 1e30f2965..2f47647b5 100644 --- a/include/rtkSumOfSquaresImageFilter.h +++ b/include/rtkSumOfSquaresImageFilter.h @@ -37,11 +37,7 @@ template class ITK_TEMPLATE_EXPORT SumOfSquaresImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(SumOfSquaresImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(SumOfSquaresImageFilter); -#endif /** Standard class type alias. */ using Self = SumOfSquaresImageFilter; diff --git a/include/rtkThreeDCircularProjectionGeometry.h b/include/rtkThreeDCircularProjectionGeometry.h index fc289acbb..6363d9b31 100644 --- a/include/rtkThreeDCircularProjectionGeometry.h +++ b/include/rtkThreeDCircularProjectionGeometry.h @@ -50,11 +50,7 @@ namespace rtk class RTK_EXPORT ThreeDCircularProjectionGeometry : public ProjectionGeometry<3> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ThreeDCircularProjectionGeometry); -#else ITK_DISALLOW_COPY_AND_MOVE(ThreeDCircularProjectionGeometry); -#endif using Self = ThreeDCircularProjectionGeometry; using Superclass = ProjectionGeometry<3>; diff --git a/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h b/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h index 2e9155380..b1a3504e3 100644 --- a/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h +++ b/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h @@ -44,11 +44,7 @@ namespace rtk class RTK_EXPORT ThreeDCircularProjectionGeometryXMLFileReader : public itk::XMLReader { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ThreeDCircularProjectionGeometryXMLFileReader); -#else ITK_DISALLOW_COPY_AND_MOVE(ThreeDCircularProjectionGeometryXMLFileReader); -#endif /** Standard type alias */ using Self = ThreeDCircularProjectionGeometryXMLFileReader; diff --git a/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h b/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h index e076ef7f2..e8d97e6f8 100644 --- a/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h +++ b/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h @@ -42,11 +42,7 @@ class RTK_EXPORT ThreeDCircularProjectionGeometryXMLFileWriter : public itk::XMLWriterBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(ThreeDCircularProjectionGeometryXMLFileWriter); -#else ITK_DISALLOW_COPY_AND_MOVE(ThreeDCircularProjectionGeometryXMLFileWriter); -#endif /** standard type alias */ using Superclass = itk::XMLWriterBase; diff --git a/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h b/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h index 8e8893d37..606cfb679 100644 --- a/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h +++ b/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h @@ -118,11 +118,7 @@ class ITK_TEMPLATE_EXPORT TotalNuclearVariationDenoisingBPDQImageFilter : public rtk::DenoisingBPDQImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(TotalNuclearVariationDenoisingBPDQImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(TotalNuclearVariationDenoisingBPDQImageFilter); -#endif /** Standard class type alias. */ using Self = TotalNuclearVariationDenoisingBPDQImageFilter; diff --git a/include/rtkTotalVariationDenoiseSequenceImageFilter.h b/include/rtkTotalVariationDenoiseSequenceImageFilter.h index 10daff787..a82dd0e55 100644 --- a/include/rtkTotalVariationDenoiseSequenceImageFilter.h +++ b/include/rtkTotalVariationDenoiseSequenceImageFilter.h @@ -80,11 +80,7 @@ class ITK_TEMPLATE_EXPORT TotalVariationDenoiseSequenceImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(TotalVariationDenoiseSequenceImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(TotalVariationDenoiseSequenceImageFilter); -#endif /** Standard class type alias. */ using Self = TotalVariationDenoiseSequenceImageFilter; diff --git a/include/rtkTotalVariationDenoisingBPDQImageFilter.h b/include/rtkTotalVariationDenoisingBPDQImageFilter.h index 2301d2a1c..e39be8a16 100644 --- a/include/rtkTotalVariationDenoisingBPDQImageFilter.h +++ b/include/rtkTotalVariationDenoisingBPDQImageFilter.h @@ -114,11 +114,7 @@ class ITK_TEMPLATE_EXPORT TotalVariationDenoisingBPDQImageFilter : public rtk::DenoisingBPDQImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(TotalVariationDenoisingBPDQImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(TotalVariationDenoisingBPDQImageFilter); -#endif /** Standard class type alias. */ using Self = TotalVariationDenoisingBPDQImageFilter; diff --git a/include/rtkTotalVariationImageFilter.h b/include/rtkTotalVariationImageFilter.h index a10ae1c2c..aeaa07853 100644 --- a/include/rtkTotalVariationImageFilter.h +++ b/include/rtkTotalVariationImageFilter.h @@ -50,11 +50,7 @@ template class ITK_TEMPLATE_EXPORT TotalVariationImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(TotalVariationImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(TotalVariationImageFilter); -#endif /** Standard Self type alias */ using Self = TotalVariationImageFilter; diff --git a/include/rtkUnwarpSequenceConjugateGradientOperator.h b/include/rtkUnwarpSequenceConjugateGradientOperator.h index 833cfba57..9d516ce07 100644 --- a/include/rtkUnwarpSequenceConjugateGradientOperator.h +++ b/include/rtkUnwarpSequenceConjugateGradientOperator.h @@ -67,11 +67,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(UnwarpSequenceConjugateGradientOperator); -#else ITK_DISALLOW_COPY_AND_MOVE(UnwarpSequenceConjugateGradientOperator); -#endif /** Standard class type alias. */ using Self = UnwarpSequenceConjugateGradientOperator; diff --git a/include/rtkUnwarpSequenceImageFilter.h b/include/rtkUnwarpSequenceImageFilter.h index 7281cef6c..9fda5d32a 100644 --- a/include/rtkUnwarpSequenceImageFilter.h +++ b/include/rtkUnwarpSequenceImageFilter.h @@ -81,11 +81,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(UnwarpSequenceImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(UnwarpSequenceImageFilter); -#endif /** Standard class type alias. */ using Self = UnwarpSequenceImageFilter; diff --git a/include/rtkUpsampleImageFilter.h b/include/rtkUpsampleImageFilter.h index baa8ee2ee..1a7c1edad 100644 --- a/include/rtkUpsampleImageFilter.h +++ b/include/rtkUpsampleImageFilter.h @@ -39,11 +39,7 @@ template class ITK_TEMPLATE_EXPORT UpsampleImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(UpsampleImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(UpsampleImageFilter); -#endif /** Standard class type alias. */ using Self = UpsampleImageFilter; diff --git a/include/rtkVarianObiGeometryReader.h b/include/rtkVarianObiGeometryReader.h index 08adfc294..a0014da75 100644 --- a/include/rtkVarianObiGeometryReader.h +++ b/include/rtkVarianObiGeometryReader.h @@ -39,11 +39,7 @@ namespace rtk class RTK_EXPORT VarianObiGeometryReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(VarianObiGeometryReader); -#else ITK_DISALLOW_COPY_AND_MOVE(VarianObiGeometryReader); -#endif /** Standard type alias */ using Self = VarianObiGeometryReader; diff --git a/include/rtkVarianObiRawImageFilter.h b/include/rtkVarianObiRawImageFilter.h index 2a787f16e..de56a4337 100644 --- a/include/rtkVarianObiRawImageFilter.h +++ b/include/rtkVarianObiRawImageFilter.h @@ -96,11 +96,7 @@ class ITK_TEMPLATE_EXPORT VarianObiRawImageFilter Function::ObiAttenuation> { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(VarianObiRawImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(VarianObiRawImageFilter); -#endif /** Standard class type alias. */ using Self = VarianObiRawImageFilter; diff --git a/include/rtkVarianObiXMLFileReader.h b/include/rtkVarianObiXMLFileReader.h index a2c9e35e5..1092c7b8f 100644 --- a/include/rtkVarianObiXMLFileReader.h +++ b/include/rtkVarianObiXMLFileReader.h @@ -45,11 +45,7 @@ namespace rtk class RTK_EXPORT VarianObiXMLFileReader : public itk::XMLReader { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(VarianObiXMLFileReader); -#else ITK_DISALLOW_COPY_AND_MOVE(VarianObiXMLFileReader); -#endif /** Standard type alias */ using Self = VarianObiXMLFileReader; diff --git a/include/rtkVarianProBeamGeometryReader.h b/include/rtkVarianProBeamGeometryReader.h index 71a06ee4e..e6fcf7c66 100644 --- a/include/rtkVarianProBeamGeometryReader.h +++ b/include/rtkVarianProBeamGeometryReader.h @@ -39,11 +39,7 @@ namespace rtk class RTK_EXPORT VarianProBeamGeometryReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(VarianProBeamGeometryReader); -#else ITK_DISALLOW_COPY_AND_MOVE(VarianProBeamGeometryReader); -#endif /** Standard type alias */ using Self = VarianProBeamGeometryReader; diff --git a/include/rtkVarianProBeamXMLFileReader.h b/include/rtkVarianProBeamXMLFileReader.h index 3e66761b7..92885fa2a 100644 --- a/include/rtkVarianProBeamXMLFileReader.h +++ b/include/rtkVarianProBeamXMLFileReader.h @@ -44,11 +44,7 @@ namespace rtk class RTK_EXPORT VarianProBeamXMLFileReader : public itk::XMLReader { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(VarianProBeamXMLFileReader); -#else ITK_DISALLOW_COPY_AND_MOVE(VarianProBeamXMLFileReader); -#endif /** Standard type alias */ using Self = VarianProBeamXMLFileReader; diff --git a/include/rtkVectorImageToImageFilter.h b/include/rtkVectorImageToImageFilter.h index 6b5dc2b0e..9da88c480 100644 --- a/include/rtkVectorImageToImageFilter.h +++ b/include/rtkVectorImageToImageFilter.h @@ -47,11 +47,7 @@ template class ITK_TEMPLATE_EXPORT VectorImageToImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(VectorImageToImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(VectorImageToImageFilter); -#endif /** Standard class type alias. */ using Self = VectorImageToImageFilter; diff --git a/include/rtkWarpFourDToProjectionStackImageFilter.h b/include/rtkWarpFourDToProjectionStackImageFilter.h index 88bebfcd3..e06659a55 100644 --- a/include/rtkWarpFourDToProjectionStackImageFilter.h +++ b/include/rtkWarpFourDToProjectionStackImageFilter.h @@ -89,11 +89,7 @@ class ITK_TEMPLATE_EXPORT WarpFourDToProjectionStackImageFilter : public rtk::FourDToProjectionStackImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(WarpFourDToProjectionStackImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(WarpFourDToProjectionStackImageFilter); -#endif /** Standard class type alias. */ using Self = WarpFourDToProjectionStackImageFilter; diff --git a/include/rtkWarpProjectionStackToFourDImageFilter.h b/include/rtkWarpProjectionStackToFourDImageFilter.h index 7121a9d2c..97d0c60c5 100644 --- a/include/rtkWarpProjectionStackToFourDImageFilter.h +++ b/include/rtkWarpProjectionStackToFourDImageFilter.h @@ -86,11 +86,7 @@ class ITK_TEMPLATE_EXPORT WarpProjectionStackToFourDImageFilter : public ProjectionStackToFourDImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(WarpProjectionStackToFourDImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(WarpProjectionStackToFourDImageFilter); -#endif /** Standard class type alias. */ using Self = WarpProjectionStackToFourDImageFilter; diff --git a/include/rtkWarpSequenceImageFilter.h b/include/rtkWarpSequenceImageFilter.h index c2d0fe6b0..32702cdaf 100644 --- a/include/rtkWarpSequenceImageFilter.h +++ b/include/rtkWarpSequenceImageFilter.h @@ -97,11 +97,7 @@ template { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(WarpSequenceImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(WarpSequenceImageFilter); -#endif /** Standard class type alias. */ using Self = WarpSequenceImageFilter; diff --git a/include/rtkWaterPrecorrectionImageFilter.h b/include/rtkWaterPrecorrectionImageFilter.h index 5ef52e005..85439dc01 100644 --- a/include/rtkWaterPrecorrectionImageFilter.h +++ b/include/rtkWaterPrecorrectionImageFilter.h @@ -40,11 +40,7 @@ template class ITK_TEMPLATE_EXPORT WaterPrecorrectionImageFilter : public itk::InPlaceImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(WaterPrecorrectionImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(WaterPrecorrectionImageFilter); -#endif /** Standard class type alias. */ using Self = WaterPrecorrectionImageFilter; diff --git a/include/rtkWeidingerForwardModelImageFilter.h b/include/rtkWeidingerForwardModelImageFilter.h index 88379c250..c70f94346 100644 --- a/include/rtkWeidingerForwardModelImageFilter.h +++ b/include/rtkWeidingerForwardModelImageFilter.h @@ -47,11 +47,7 @@ class ITK_TEMPLATE_EXPORT WeidingerForwardModelImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(WeidingerForwardModelImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(WeidingerForwardModelImageFilter); -#endif /** Standard class type alias. */ using Self = WeidingerForwardModelImageFilter; diff --git a/include/rtkXRadGeometryReader.h b/include/rtkXRadGeometryReader.h index af9d9ee72..61a0d9633 100644 --- a/include/rtkXRadGeometryReader.h +++ b/include/rtkXRadGeometryReader.h @@ -39,11 +39,7 @@ namespace rtk class RTK_EXPORT XRadGeometryReader : public itk::LightProcessObject { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(XRadGeometryReader); -#else ITK_DISALLOW_COPY_AND_MOVE(XRadGeometryReader); -#endif /** Standard type alias */ using Self = XRadGeometryReader; diff --git a/include/rtkXRadImageIOFactory.h b/include/rtkXRadImageIOFactory.h index 496daac27..01da60117 100644 --- a/include/rtkXRadImageIOFactory.h +++ b/include/rtkXRadImageIOFactory.h @@ -38,11 +38,7 @@ namespace rtk class RTK_EXPORT XRadImageIOFactory : public itk::ObjectFactoryBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(XRadImageIOFactory); -#else ITK_DISALLOW_COPY_AND_MOVE(XRadImageIOFactory); -#endif /** Standard class type alias. */ using Self = XRadImageIOFactory; diff --git a/include/rtkXRadRawToAttenuationImageFilter.h b/include/rtkXRadRawToAttenuationImageFilter.h index 4abbb1bf9..666372daf 100644 --- a/include/rtkXRadRawToAttenuationImageFilter.h +++ b/include/rtkXRadRawToAttenuationImageFilter.h @@ -36,11 +36,7 @@ template class ITK_TEMPLATE_EXPORT XRadRawToAttenuationImageFilter : public itk::ImageToImageFilter { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(XRadRawToAttenuationImageFilter); -#else ITK_DISALLOW_COPY_AND_MOVE(XRadRawToAttenuationImageFilter); -#endif /** Standard class type alias. */ using Self = XRadRawToAttenuationImageFilter; diff --git a/include/rtkXimImageIOFactory.h b/include/rtkXimImageIOFactory.h index 0a67552bb..458e3766f 100644 --- a/include/rtkXimImageIOFactory.h +++ b/include/rtkXimImageIOFactory.h @@ -44,11 +44,7 @@ namespace rtk class RTK_EXPORT XimImageIOFactory : public itk::ObjectFactoryBase { public: -#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 - ITK_DISALLOW_COPY_AND_ASSIGN(XimImageIOFactory); -#else ITK_DISALLOW_COPY_AND_MOVE(XimImageIOFactory); -#endif /** Standard class type alias. */ using Self = XimImageIOFactory;