Skip to content

Commit

Permalink
STYLE: Call ITK_DISALLOW_COPY_AND_MOVE, not ITK_DISALLOW_COPY_AND_ASSIGN
Browse files Browse the repository at this point in the history
The macro `ITK_DISALLOW_COPY_AND_ASSIGN` was just declared
`ITK_FUTURE_LEGACY_REMOVE` with the previous commit, so now
call the new `ITK_DISALLOW_COPY_AND_MOVE` macro instead!
  • Loading branch information
N-Dekker authored and dzenanz committed Oct 13, 2020
1 parent 7d177ca commit 4c0982d
Show file tree
Hide file tree
Showing 1,373 changed files with 1,405 additions and 1,405 deletions.
2 changes: 1 addition & 1 deletion Examples/IO/XML/itkParticleSwarmOptimizerDOMReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ParticleSwarmOptimizerDOMReader
: public DOMReader<ParticleSwarmOptimizer>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ParticleSwarmOptimizerDOMReader);
ITK_DISALLOW_COPY_AND_MOVE(ParticleSwarmOptimizerDOMReader);

/** Standard class type aliases. */
using Self = ParticleSwarmOptimizerDOMReader;
Expand Down
2 changes: 1 addition & 1 deletion Examples/IO/XML/itkParticleSwarmOptimizerDOMWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ParticleSwarmOptimizerDOMWriter
: public DOMWriter<ParticleSwarmOptimizer>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ParticleSwarmOptimizerDOMWriter);
ITK_DISALLOW_COPY_AND_MOVE(ParticleSwarmOptimizerDOMWriter);

/** Standard class type aliases. */
using Self = ParticleSwarmOptimizerDOMWriter;
Expand Down
2 changes: 1 addition & 1 deletion Examples/IO/XML/itkParticleSwarmOptimizerSAXReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class ParticleSwarmOptimizerSAXReader
: public XMLReader<ParticleSwarmOptimizer>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ParticleSwarmOptimizerSAXReader);
ITK_DISALLOW_COPY_AND_MOVE(ParticleSwarmOptimizerSAXReader);

/** Standard class type aliases */
using Self = ParticleSwarmOptimizerSAXReader;
Expand Down
2 changes: 1 addition & 1 deletion Examples/IO/XML/itkParticleSwarmOptimizerSAXWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ParticleSwarmOptimizerSAXWriter
: public XMLWriterBase<ParticleSwarmOptimizer>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ParticleSwarmOptimizerSAXWriter);
ITK_DISALLOW_COPY_AND_MOVE(ParticleSwarmOptimizerSAXWriter);

/** Standard class type aliases. */
using Self = ParticleSwarmOptimizerSAXWriter;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Bridge/VTK/include/itkVTKImageExport.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ template <typename TInputImage>
class ITK_TEMPLATE_EXPORT VTKImageExport : public VTKImageExportBase
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(VTKImageExport);
ITK_DISALLOW_COPY_AND_MOVE(VTKImageExport);

/** Standard class type aliases. */
using Self = VTKImageExport;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Bridge/VTK/include/itkVTKImageExportBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace itk
class ITKVTK_EXPORT VTKImageExportBase : public ProcessObject
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(VTKImageExportBase);
ITK_DISALLOW_COPY_AND_MOVE(VTKImageExportBase);

/** Standard class type aliases. */
using Self = VTKImageExportBase;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Bridge/VTK/include/itkVTKImageImport.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ template <typename TOutputImage>
class ITK_TEMPLATE_EXPORT VTKImageImport : public ImageSource<TOutputImage>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(VTKImageImport);
ITK_DISALLOW_COPY_AND_MOVE(VTKImageImport);

/** Standard class type aliases. */
using Self = VTKImageImport;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Bridge/VtkGlue/include/itkImageToVTKImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ template <typename TInputImage>
class ITK_TEMPLATE_EXPORT ImageToVTKImageFilter : public ProcessObject
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ImageToVTKImageFilter);
ITK_DISALLOW_COPY_AND_MOVE(ImageToVTKImageFilter);

/** Standard class type aliases. */
using Self = ImageToVTKImageFilter;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Bridge/VtkGlue/include/itkVTKImageToImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ template <typename TOutputImage>
class ITK_TEMPLATE_EXPORT VTKImageToImageFilter : public VTKImageImport<TOutputImage>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(VTKImageToImageFilter);
ITK_DISALLOW_COPY_AND_MOVE(VTKImageToImageFilter);

/** Standard class type aliases. */
using Self = VTKImageToImageFilter;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Bridge/VtkGlue/include/vtkCaptureScreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ template <typename TImageWriter>
class vtkCaptureScreen
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(vtkCaptureScreen);
ITK_DISALLOW_COPY_AND_MOVE(vtkCaptureScreen);

using ImageWriterType = TImageWriter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace itk
class ITKDeprecated_EXPORT ConditionVariable : public LightObject
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ConditionVariable);
ITK_DISALLOW_COPY_AND_MOVE(ConditionVariable);

/** Standard class type aliases. */
using Self = ConditionVariable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace itk
class ITKDeprecated_EXPORT FastMutexLock : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(FastMutexLock);
ITK_DISALLOW_COPY_AND_MOVE(FastMutexLock);

/** Standard class type aliases. */
using Self = FastMutexLock;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ template <typename TInputImage>
class ITK_TEMPLATE_EXPORT ImageTransformer : public ProcessObject
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ImageTransformer);
ITK_DISALLOW_COPY_AND_MOVE(ImageTransformer);

/** Standard class type aliases. */
using Self = ImageTransformer;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Compatibility/Deprecated/include/itkMutexLock.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class ITKDeprecated_EXPORT SimpleMutexLock
class ITKDeprecated_EXPORT MutexLock : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(MutexLock);
ITK_DISALLOW_COPY_AND_MOVE(MutexLock);

/** Standard class type aliases. */
using Self = MutexLock;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ template <typename TMutex>
class MutexLockHolder
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(MutexLockHolder);
ITK_DISALLOW_COPY_AND_MOVE(MutexLockHolder);

using Self = MutexLockHolder;
using MutexType = TMutex;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Compatibility/Deprecated/include/itkTreeNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ template <typename TValue>
class ITK_TEMPLATE_EXPORT TreeNode : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(TreeNode);
ITK_DISALLOW_COPY_AND_MOVE(TreeNode);

/** Standard type alias */
using Superclass = Object;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class VectorCastImageFilter
Functor::VectorCast<typename TInputImage::PixelType, typename TOutputImage::PixelType>>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(VectorCastImageFilter);
ITK_DISALLOW_COPY_AND_MOVE(VectorCastImageFilter);

/** Standard class type aliases. */
using Self = VectorCastImageFilter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class ITK_TEMPLATE_EXPORT VectorCentralDifferenceImageFunction
TCoordRep>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(VectorCentralDifferenceImageFunction);
ITK_DISALLOW_COPY_AND_MOVE(VectorCentralDifferenceImageFunction);

using InputPixelType = typename TInputImage::PixelType;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ template <typename TInputImage, typename TOutputImage, typename TInterpolatorPre
class ITK_TEMPLATE_EXPORT VectorResampleImageFilter : public ImageToImageFilter<TInputImage, TOutputImage>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(VectorResampleImageFilter);
ITK_DISALLOW_COPY_AND_MOVE(VectorResampleImageFilter);

/** Standard class type aliases. */
using Self = VectorResampleImageFilter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ITK_TEMPLATE_EXPORT AtanRegularizedHeavisideStepFunction
: public RegularizedHeavisideStepFunction<TInput, TOutput>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(AtanRegularizedHeavisideStepFunction);
ITK_DISALLOW_COPY_AND_MOVE(AtanRegularizedHeavisideStepFunction);

using Self = AtanRegularizedHeavisideStepFunction;
using Superclass = RegularizedHeavisideStepFunction<TInput, TOutput>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ template <typename T>
class ITK_TEMPLATE_EXPORT AutoPointerDataObjectDecorator : public DataObject
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(AutoPointerDataObjectDecorator);
ITK_DISALLOW_COPY_AND_MOVE(AutoPointerDataObjectDecorator);

/** Standard type alias */
using Self = AutoPointerDataObjectDecorator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ template <unsigned int VSplineOrder = 3, typename TRealValueType = double>
class BSplineDerivativeKernelFunction : public KernelFunctionBase<TRealValueType>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(BSplineDerivativeKernelFunction);
ITK_DISALLOW_COPY_AND_MOVE(BSplineDerivativeKernelFunction);

/** Standard class type aliases. */
using Self = BSplineDerivativeKernelFunction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class ITK_TEMPLATE_EXPORT BSplineInterpolationWeightFunction
: public FunctionBase<ContinuousIndex<TCoordRep, VSpaceDimension>, Array<double>>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(BSplineInterpolationWeightFunction);
ITK_DISALLOW_COPY_AND_MOVE(BSplineInterpolationWeightFunction);

/** Standard class type aliases. */
using Self = BSplineInterpolationWeightFunction;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkBSplineKernelFunction.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ template <unsigned int VSplineOrder = 3, typename TRealValueType = double>
class ITK_TEMPLATE_EXPORT BSplineKernelFunction : public KernelFunctionBase<TRealValueType>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(BSplineKernelFunction);
ITK_DISALLOW_COPY_AND_MOVE(BSplineKernelFunction);

/** Standard class type aliases. */
using Self = BSplineKernelFunction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class ITK_TEMPLATE_EXPORT BinaryThresholdSpatialFunction
: public SpatialFunction<bool, TFunction::ImageDimension, typename TFunction::InputType>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(BinaryThresholdSpatialFunction);
ITK_DISALLOW_COPY_AND_MOVE(BinaryThresholdSpatialFunction);

/** Standard class type aliases. */
using Self = BinaryThresholdSpatialFunction;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkBoundingBox.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ template <typename TPointIdentifier = IdentifierType,
class ITK_TEMPLATE_EXPORT BoundingBox : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(BoundingBox);
ITK_DISALLOW_COPY_AND_MOVE(BoundingBox);

/** Standard class type aliases. */
using Self = BoundingBox;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkBuildInformation.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ITKCommon_EXPORT BuildInformation final : public Object
public:
// Using the `rule of zero` to this aggregate type
// C++20 changes the definition of aggregate such that classes with any user-declared ctors are no longer aggregates.
ITK_DISALLOW_COPY_AND_ASSIGN(BuildInformation);
ITK_DISALLOW_COPY_AND_MOVE(BuildInformation);

/** Standard class type aliases. */
using Self = BuildInformation;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkByteSwapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ template <typename T>
class ITK_TEMPLATE_EXPORT ByteSwapper : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ByteSwapper);
ITK_DISALLOW_COPY_AND_MOVE(ByteSwapper);

/** Standard class type aliases. */
using Self = ByteSwapper;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkCellInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ template <typename TPixelType, typename TCellTraits>
class ITK_TEMPLATE_EXPORT CellInterface
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(CellInterface);
ITK_DISALLOW_COPY_AND_MOVE(CellInterface);

/** Standard class type aliases. */
itkCellCommonTypedefs(CellInterface);
Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/Common/include/itkCellInterfaceVisitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ template <typename TPixelType, typename TCellTraits>
class ITK_TEMPLATE_EXPORT CellInterfaceVisitor : public LightObject
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(CellInterfaceVisitor);
ITK_DISALLOW_COPY_AND_MOVE(CellInterfaceVisitor);

/** Standard class type aliases. */
using Self = CellInterfaceVisitor;
Expand Down Expand Up @@ -102,7 +102,7 @@ class CellInterfaceVisitorImplementation
, public UserVisitor
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(CellInterfaceVisitorImplementation);
ITK_DISALLOW_COPY_AND_MOVE(CellInterfaceVisitorImplementation);

/** Standard class type aliases. */
using Self = CellInterfaceVisitorImplementation;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkColorTable.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ template <typename TPixel>
class ITK_TEMPLATE_EXPORT ColorTable : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ColorTable);
ITK_DISALLOW_COPY_AND_MOVE(ColorTable);

/** Standard class type aliases. */
using Self = ColorTable;
Expand Down
10 changes: 5 additions & 5 deletions Modules/Core/Common/include/itkCommand.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace itk
class ITKCommon_EXPORT Command : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(Command);
ITK_DISALLOW_COPY_AND_MOVE(Command);

/** Standard class type aliases. */
using Self = Command;
Expand Down Expand Up @@ -86,7 +86,7 @@ template <typename T>
class ITK_TEMPLATE_EXPORT MemberCommand : public Command
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(MemberCommand);
ITK_DISALLOW_COPY_AND_MOVE(MemberCommand);

/** pointer to a member function that takes a Object* and the event */
using TMemberFunctionPointer = void (T::*)(Object *, const EventObject &);
Expand Down Expand Up @@ -165,7 +165,7 @@ template <typename T>
class ITK_TEMPLATE_EXPORT ReceptorMemberCommand : public Command
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ReceptorMemberCommand);
ITK_DISALLOW_COPY_AND_MOVE(ReceptorMemberCommand);

/** pointer to a member function that takes a Object* and the event */
using TMemberFunctionPointer = void (T::*)(const EventObject &);
Expand Down Expand Up @@ -234,7 +234,7 @@ template <typename T>
class ITK_TEMPLATE_EXPORT SimpleMemberCommand : public Command
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(SimpleMemberCommand);
ITK_DISALLOW_COPY_AND_MOVE(SimpleMemberCommand);

/** A method callback. */
using TMemberFunctionPointer = void (T::*)();
Expand Down Expand Up @@ -301,7 +301,7 @@ template <typename T>
class ITK_TEMPLATE_EXPORT SimpleConstMemberCommand : public Command
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(SimpleConstMemberCommand);
ITK_DISALLOW_COPY_AND_MOVE(SimpleConstMemberCommand);

/** A const member method callback. */
using TMemberFunctionPointer = void (T::*)() const;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class ITK_TEMPLATE_EXPORT ConicShellInteriorExteriorSpatialFunction
: public InteriorExteriorSpatialFunction<VDimension, TInput>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ConicShellInteriorExteriorSpatialFunction);
ITK_DISALLOW_COPY_AND_MOVE(ConicShellInteriorExteriorSpatialFunction);

/** Standard class type aliases. */
using Self = ConicShellInteriorExteriorSpatialFunction;
Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/Common/include/itkCreateObjectFunction.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace itk
class ITKCommon_EXPORT CreateObjectFunctionBase : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(CreateObjectFunctionBase);
ITK_DISALLOW_COPY_AND_MOVE(CreateObjectFunctionBase);

/** Standard type alias. */
using Self = CreateObjectFunctionBase;
Expand Down Expand Up @@ -60,7 +60,7 @@ template <typename T>
class CreateObjectFunction : public CreateObjectFunctionBase
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(CreateObjectFunction);
ITK_DISALLOW_COPY_AND_MOVE(CreateObjectFunction);

/** Standard class type aliases. */
using Self = CreateObjectFunction;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkDataObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ class ITKCommon_EXPORT InvalidRequestedRegionError : public DataObjectError
class ITK_FORCE_EXPORT_MACRO(ITKCommon) DataObject : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(DataObject);
ITK_DISALLOW_COPY_AND_MOVE(DataObject);

/** Standard class type aliases. */
using Self = DataObject;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkDataObjectDecorator.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ template <typename T>
class ITK_TEMPLATE_EXPORT DataObjectDecorator : public DataObject
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(DataObjectDecorator);
ITK_DISALLOW_COPY_AND_MOVE(DataObjectDecorator);

/** Standard type alias. */
using Self = DataObjectDecorator;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkDirectory.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace itk
class ITKCommon_EXPORT Directory : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(Directory);
ITK_DISALLOW_COPY_AND_MOVE(Directory);

/** Standard class type aliases. */
using Self = Directory;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkDomainThreader.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ template <typename TDomainPartitioner, typename TAssociate>
class ITK_TEMPLATE_EXPORT DomainThreader : public Object
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(DomainThreader);
ITK_DISALLOW_COPY_AND_MOVE(DomainThreader);

/** Standard class type aliases. */
using Self = DomainThreader;
Expand Down
Loading

0 comments on commit 4c0982d

Please sign in to comment.