From 9c3cc79d7251b331d2421030a76a05ff11efa5e1 Mon Sep 17 00:00:00 2001
From: Hans Johnson <hans-johnson@uiowa.edu>
Date: Wed, 14 Oct 2020 09:24:25 -0500
Subject: [PATCH] STYLE:  Missed conversions for new macro name

Call ITK_DISALLOW_COPY_AND_MOVE, not ITK_DISALLOW_COPY_AND_ASSIGN
Some conversions were missed during initial update of macro name.
---
 Examples/Filtering/CompositeFilterExample.cxx               | 2 +-
 Modules/Core/Common/src/itkExceptionObject.cxx              | 4 ++--
 Modules/Core/Common/test/itkCompensatedSummationTest2.cxx   | 2 +-
 Modules/Core/Common/test/itkDataObjectTest.cxx              | 2 +-
 Modules/Core/Common/test/itkFactoryTestLib.cxx              | 4 ++--
 Modules/Core/Common/test/itkFilterDispatchTest.cxx          | 2 +-
 Modules/Core/Common/test/itkNeighborhoodAllocatorGTest.cxx  | 2 +-
 Modules/Core/Common/test/itkObjectFactoryTest.cxx           | 6 +++---
 Modules/Core/Common/test/itkObjectFactoryTest3.cxx          | 2 +-
 Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx     | 2 +-
 Modules/Core/Common/test/itkSmartPointerGTest.cxx           | 4 ++--
 .../test/itkThreadedIndexedContainerPartitionerTest.cxx     | 2 +-
 .../Common/test/itkThreadedIteratorRangePartitionerTest.cxx | 2 +-
 .../test/itkThreadedIteratorRangePartitionerTest2.cxx       | 2 +-
 .../test/itkThreadedIteratorRangePartitionerTest3.cxx       | 2 +-
 Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx     | 2 +-
 .../Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx   | 4 ++--
 Modules/Core/Transform/test/itkMultiTransformTest.cxx       | 2 +-
 .../Filtering/CurvatureFlow/test/itkCurvatureFlowTest.cxx   | 2 +-
 ...ametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx | 2 +-
 .../Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx | 2 +-
 .../test/itkFastMarchingStoppingCriterionBaseTest.cxx       | 2 +-
 Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx  | 2 +-
 .../IO/HDF5/test/itkHDF5ImageIOStreamingReadWriteTest.cxx   | 2 +-
 Modules/IO/VTK/test/itkVTKImageIOStreamTest.cxx             | 2 +-
 Modules/Nonunit/Review/test/itkImageFunctionTest.cxx        | 2 +-
 .../Review/test/itkRegionBasedLevelSetFunctionTest.cxx      | 2 +-
 .../test/itkScalarChanAndVeseLevelSetFunctionTest1.cxx      | 2 +-
 .../test/itkScalarChanAndVeseLevelSetFunctionTest2.cxx      | 2 +-
 .../test/itkScalarRegionBasedLevelSetFunctionTest.cxx       | 2 +-
 .../test/itkGradientDescentOptimizerBasev4Test.cxx          | 4 ++--
 .../test/itkOptimizerParameterScalesEstimatorTest.cxx       | 2 +-
 .../test/itkRegistrationParameterScalesEstimatorTest.cxx    | 2 +-
 .../Statistics/test/itkSampleToSubsampleFilterTest1.cxx     | 2 +-
 .../Metricsv4/test/itkImageToImageMetricv4Test.cxx          | 2 +-
 .../Metricsv4/test/itkMetricImageGradientTest.cxx           | 4 ++--
 .../Segmentation/LevelSets/test/itkLevelSetFunctionTest.cxx | 2 +-
 .../test/itkParallelSparseFieldLevelSetImageFilterTest.cxx  | 2 +-
 Utilities/Doxygen/doxygen.config.in                         | 1 +
 .../Move_DISALLOW_COPY_to_public_section.cpp                | 5 +++--
 40 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/Examples/Filtering/CompositeFilterExample.cxx b/Examples/Filtering/CompositeFilterExample.cxx
index 3131edeaaab..452b011b52b 100644
--- a/Examples/Filtering/CompositeFilterExample.cxx
+++ b/Examples/Filtering/CompositeFilterExample.cxx
@@ -63,7 +63,7 @@ template <typename TImage>
 class CompositeExampleImageFilter : public ImageToImageFilter<TImage, TImage>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(CompositeExampleImageFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(CompositeExampleImageFilter);
 
   //  Software Guide : EndCodeSnippet
 
diff --git a/Modules/Core/Common/src/itkExceptionObject.cxx b/Modules/Core/Common/src/itkExceptionObject.cxx
index 92156012cbf..95997175b4e 100644
--- a/Modules/Core/Common/src/itkExceptionObject.cxx
+++ b/Modules/Core/Common/src/itkExceptionObject.cxx
@@ -31,7 +31,7 @@ namespace itk
 class ExceptionObject::ExceptionData : public ReferenceCounterInterface
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ExceptionData);
+  ITK_DISALLOW_COPY_AND_MOVE(ExceptionData);
 
 protected:
   // Constructor. Might throw an exception.
@@ -79,7 +79,7 @@ class ExceptionObject::ReferenceCountedExceptionData
   , public LightObject
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ReferenceCountedExceptionData);
+  ITK_DISALLOW_COPY_AND_MOVE(ReferenceCountedExceptionData);
 
   using Self = ReferenceCountedExceptionData;
   using ConstPointer = SmartPointer<const Self>;
diff --git a/Modules/Core/Common/test/itkCompensatedSummationTest2.cxx b/Modules/Core/Common/test/itkCompensatedSummationTest2.cxx
index 754b601236c..76d6472b25c 100644
--- a/Modules/Core/Common/test/itkCompensatedSummationTest2.cxx
+++ b/Modules/Core/Common/test/itkCompensatedSummationTest2.cxx
@@ -41,7 +41,7 @@ class CompensatedSummationTest2Associate
   class TestDomainThreader : public itk::DomainThreader<itk::ThreadedIndexedContainerPartitioner, Self>
   {
   public:
-    ITK_DISALLOW_COPY_AND_ASSIGN(TestDomainThreader);
+    ITK_DISALLOW_COPY_AND_MOVE(TestDomainThreader);
 
     using Self = TestDomainThreader;
     using Superclass = itk::DomainThreader<itk::ThreadedIndexedContainerPartitioner, Self>;
diff --git a/Modules/Core/Common/test/itkDataObjectTest.cxx b/Modules/Core/Common/test/itkDataObjectTest.cxx
index f2625903bdb..a0869b8947a 100644
--- a/Modules/Core/Common/test/itkDataObjectTest.cxx
+++ b/Modules/Core/Common/test/itkDataObjectTest.cxx
@@ -25,7 +25,7 @@ namespace itk
 class DataObjectTestHelper : public DataObject
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(DataObjectTestHelper);
+  ITK_DISALLOW_COPY_AND_MOVE(DataObjectTestHelper);
 
   /** Standard type alias. */
   using Self = DataObjectTestHelper;
diff --git a/Modules/Core/Common/test/itkFactoryTestLib.cxx b/Modules/Core/Common/test/itkFactoryTestLib.cxx
index a74387a9ecc..e8034471fca 100644
--- a/Modules/Core/Common/test/itkFactoryTestLib.cxx
+++ b/Modules/Core/Common/test/itkFactoryTestLib.cxx
@@ -26,7 +26,7 @@ template <typename TElementIdentifier, typename TElement>
 class TestImportImageContainer : public itk::ImportImageContainer<TElementIdentifier, TElement>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(TestImportImageContainer);
+  ITK_DISALLOW_COPY_AND_MOVE(TestImportImageContainer);
 
   /** Standard class type aliases.   */
   using Self = TestImportImageContainer;
@@ -137,7 +137,7 @@ class TestImportImageContainer : public itk::ImportImageContainer<TElementIdenti
 class ImportImageContainerFactory : public itk::ObjectFactoryBase
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ImportImageContainerFactory);
+  ITK_DISALLOW_COPY_AND_MOVE(ImportImageContainerFactory);
 
   using Self = ImportImageContainerFactory;
   using Superclass = itk::ObjectFactoryBase;
diff --git a/Modules/Core/Common/test/itkFilterDispatchTest.cxx b/Modules/Core/Common/test/itkFilterDispatchTest.cxx
index 0298526e684..6d741cc26b9 100644
--- a/Modules/Core/Common/test/itkFilterDispatchTest.cxx
+++ b/Modules/Core/Common/test/itkFilterDispatchTest.cxx
@@ -48,7 +48,7 @@ template <typename TInputImage, typename TOutputImage>
 class ExampleImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ExampleImageFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(ExampleImageFilter);
 
   /**
    * Standard "Self" type alias.
diff --git a/Modules/Core/Common/test/itkNeighborhoodAllocatorGTest.cxx b/Modules/Core/Common/test/itkNeighborhoodAllocatorGTest.cxx
index 51f22370de9..24c45cc3337 100644
--- a/Modules/Core/Common/test/itkNeighborhoodAllocatorGTest.cxx
+++ b/Modules/Core/Common/test/itkNeighborhoodAllocatorGTest.cxx
@@ -46,7 +46,7 @@ class ObjectCounter
   static std::size_t m_Count;
 
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ObjectCounter);
+  ITK_DISALLOW_COPY_AND_MOVE(ObjectCounter);
 
   ObjectCounter() ITK_NOEXCEPT { ++m_Count; }
 
diff --git a/Modules/Core/Common/test/itkObjectFactoryTest.cxx b/Modules/Core/Common/test/itkObjectFactoryTest.cxx
index 21fb3c70275..d61489bdd91 100644
--- a/Modules/Core/Common/test/itkObjectFactoryTest.cxx
+++ b/Modules/Core/Common/test/itkObjectFactoryTest.cxx
@@ -33,7 +33,7 @@ template <typename TPixel, unsigned int VImageDimension = 2>
 class TestImage : public itk::Image<TPixel, VImageDimension>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(TestImage);
+  ITK_DISALLOW_COPY_AND_MOVE(TestImage);
 
   /** Standard class type aliases.   */
   using Self = TestImage;
@@ -56,7 +56,7 @@ template <typename TPixel, unsigned int VImageDimension = 3>
 class TestImage2 : public itk::Image<TPixel, VImageDimension>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(TestImage2);
+  ITK_DISALLOW_COPY_AND_MOVE(TestImage2);
 
   /** Standard class type aliases.   */
   using Self = TestImage2;
@@ -78,7 +78,7 @@ class TestImage2 : public itk::Image<TPixel, VImageDimension>
 class TestFactory : public itk::ObjectFactoryBase
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(TestFactory);
+  ITK_DISALLOW_COPY_AND_MOVE(TestFactory);
 
   using Self = TestFactory;
   using Superclass = itk::ObjectFactoryBase;
diff --git a/Modules/Core/Common/test/itkObjectFactoryTest3.cxx b/Modules/Core/Common/test/itkObjectFactoryTest3.cxx
index 2b19864b62a..f2992978dfc 100644
--- a/Modules/Core/Common/test/itkObjectFactoryTest3.cxx
+++ b/Modules/Core/Common/test/itkObjectFactoryTest3.cxx
@@ -34,7 +34,7 @@ class FakeObject3 : public itk::Object
 class TestFactory3 : public itk::ObjectFactoryBase
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(TestFactory3);
+  ITK_DISALLOW_COPY_AND_MOVE(TestFactory3);
 
   using Self = TestFactory3;
   using Superclass = itk::ObjectFactoryBase;
diff --git a/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx b/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx
index 0f897048ed7..b5c6d1680f5 100644
--- a/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx
+++ b/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx
@@ -62,7 +62,7 @@ class TanHelperImageFilter
       Function::TanHelper<typename TInputImage::PixelType, typename TOutputImage::PixelType>>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(TanHelperImageFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(TanHelperImageFilter);
 
   /** Standard class type aliases. */
   using Self = TanHelperImageFilter;
diff --git a/Modules/Core/Common/test/itkSmartPointerGTest.cxx b/Modules/Core/Common/test/itkSmartPointerGTest.cxx
index 6484381adf1..4f38c57c5ec 100644
--- a/Modules/Core/Common/test/itkSmartPointerGTest.cxx
+++ b/Modules/Core/Common/test/itkSmartPointerGTest.cxx
@@ -29,7 +29,7 @@ namespace
 class Derived1 : public itk::Object
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(Derived1);
+  ITK_DISALLOW_COPY_AND_MOVE(Derived1);
 
   /** Standard class type aliases. */
   using Self = Derived1;
@@ -67,7 +67,7 @@ class Derived1 : public itk::Object
 class Derived2 : public itk::Object
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(Derived2);
+  ITK_DISALLOW_COPY_AND_MOVE(Derived2);
 
   /** Standard class type aliases. */
   using Self = Derived2;
diff --git a/Modules/Core/Common/test/itkThreadedIndexedContainerPartitionerTest.cxx b/Modules/Core/Common/test/itkThreadedIndexedContainerPartitionerTest.cxx
index 7e42623d181..3db7791179c 100644
--- a/Modules/Core/Common/test/itkThreadedIndexedContainerPartitionerTest.cxx
+++ b/Modules/Core/Common/test/itkThreadedIndexedContainerPartitionerTest.cxx
@@ -26,7 +26,7 @@ class DomainThreaderAssociate
   class TestDomainThreader : public itk::DomainThreader<itk::ThreadedIndexedContainerPartitioner, Self>
   {
   public:
-    ITK_DISALLOW_COPY_AND_ASSIGN(TestDomainThreader);
+    ITK_DISALLOW_COPY_AND_MOVE(TestDomainThreader);
 
     using Self = TestDomainThreader;
     using Superclass = itk::DomainThreader<itk::ThreadedIndexedContainerPartitioner, Self>;
diff --git a/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest.cxx b/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest.cxx
index d29a26a2d01..2c4fb332d1a 100644
--- a/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest.cxx
+++ b/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest.cxx
@@ -31,7 +31,7 @@ class IteratorRangeDomainThreaderAssociate
   class TestDomainThreader : public itk::DomainThreader<ThreadedPartitionerType, Self>
   {
   public:
-    ITK_DISALLOW_COPY_AND_ASSIGN(TestDomainThreader);
+    ITK_DISALLOW_COPY_AND_MOVE(TestDomainThreader);
 
     using Self = TestDomainThreader;
     using Superclass = itk::DomainThreader<ThreadedPartitionerType, Self>;
diff --git a/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest2.cxx b/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest2.cxx
index 5551bfbe2b4..1bef96d7b1c 100644
--- a/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest2.cxx
+++ b/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest2.cxx
@@ -34,7 +34,7 @@ class IteratorRangeDomainThreaderAssociate
   class TestDomainThreader : public itk::DomainThreader<ThreadedPartitionerType, Self>
   {
   public:
-    ITK_DISALLOW_COPY_AND_ASSIGN(TestDomainThreader);
+    ITK_DISALLOW_COPY_AND_MOVE(TestDomainThreader);
 
     using Self = TestDomainThreader;
     using Superclass = itk::DomainThreader<ThreadedPartitionerType, Self>;
diff --git a/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest3.cxx b/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest3.cxx
index 711aab741bb..e5b739fc2be 100644
--- a/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest3.cxx
+++ b/Modules/Core/Common/test/itkThreadedIteratorRangePartitionerTest3.cxx
@@ -34,7 +34,7 @@ class IteratorRangeDomainThreaderAssociate
   class TestDomainThreader : public itk::DomainThreader<ThreadedPartitionerType, Self>
   {
   public:
-    ITK_DISALLOW_COPY_AND_ASSIGN(TestDomainThreader);
+    ITK_DISALLOW_COPY_AND_MOVE(TestDomainThreader);
 
     using Self = TestDomainThreader;
     using Superclass = itk::DomainThreader<ThreadedPartitionerType, Self>;
diff --git a/Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx b/Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx
index f57243d7694..a211de8a464 100644
--- a/Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx
+++ b/Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx
@@ -27,7 +27,7 @@ template <typename TInputMesh, typename TOutputMesh, typename TTransform>
 class MeshSourceGraftOutputFilter : public MeshToMeshFilter<TInputMesh, TOutputMesh>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(MeshSourceGraftOutputFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(MeshSourceGraftOutputFilter);
 
   /** Standard class type aliases. */
   using Self = MeshSourceGraftOutputFilter;
diff --git a/Modules/Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx b/Modules/Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx
index 475fe3f0a26..4a1d43fd1c7 100644
--- a/Modules/Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx
+++ b/Modules/Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx
@@ -89,7 +89,7 @@ template <unsigned int TDimension = 3>
 class DummySpatialObject : public SpatialObject<TDimension>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(DummySpatialObject);
+  ITK_DISALLOW_COPY_AND_MOVE(DummySpatialObject);
 
   using Self = DummySpatialObject;
   using Superclass = SpatialObject<TDimension>;
@@ -134,7 +134,7 @@ template <unsigned int NDimensions = 3>
 class MetaDummyConverter : public MetaConverterBase<NDimensions>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(MetaDummyConverter);
+  ITK_DISALLOW_COPY_AND_MOVE(MetaDummyConverter);
 
   /** Standard class type aliases */
   using Self = MetaDummyConverter;
diff --git a/Modules/Core/Transform/test/itkMultiTransformTest.cxx b/Modules/Core/Transform/test/itkMultiTransformTest.cxx
index bf0e65b9816..813673b3dea 100644
--- a/Modules/Core/Transform/test/itkMultiTransformTest.cxx
+++ b/Modules/Core/Transform/test/itkMultiTransformTest.cxx
@@ -75,7 +75,7 @@ template <class TScalar = double, unsigned int NDimensions = itkMultiTransformTe
 class MultiTransformTestTransform : public itk::MultiTransform<TScalar, NDimensions>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(MultiTransformTestTransform);
+  ITK_DISALLOW_COPY_AND_MOVE(MultiTransformTestTransform);
 
   /** Standard class type aliases. */
   using Self = MultiTransformTestTransform;
diff --git a/Modules/Filtering/CurvatureFlow/test/itkCurvatureFlowTest.cxx b/Modules/Filtering/CurvatureFlow/test/itkCurvatureFlowTest.cxx
index ba4eefb1d6f..220d6ce27a4 100644
--- a/Modules/Filtering/CurvatureFlow/test/itkCurvatureFlowTest.cxx
+++ b/Modules/Filtering/CurvatureFlow/test/itkCurvatureFlowTest.cxx
@@ -52,7 +52,7 @@ template <typename TImageType>
 class DummyFunction : public FiniteDifferenceFunction<TImageType>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(DummyFunction);
+  ITK_DISALLOW_COPY_AND_MOVE(DummyFunction);
 
   using Self = DummyFunction;
   using Superclass = FiniteDifferenceFunction<TImageType>;
diff --git a/Modules/Filtering/Deconvolution/test/itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx b/Modules/Filtering/Deconvolution/test/itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx
index d12f2742720..64bae7f5b16 100644
--- a/Modules/Filtering/Deconvolution/test/itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx
+++ b/Modules/Filtering/Deconvolution/test/itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx
@@ -31,7 +31,7 @@ template <typename TOutputImage>
 class ExampleImageSource : public GaussianImageSource<TOutputImage>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ExampleImageSource);
+  ITK_DISALLOW_COPY_AND_MOVE(ExampleImageSource);
 
   /** Standard type alias. */
   using Self = ExampleImageSource;
diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx
index ce1ced13693..c27887a0561 100644
--- a/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx
+++ b/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx
@@ -24,7 +24,7 @@ template <typename TInput, typename TOutput>
 class FastMarchingBaseTestHelper : public FastMarchingBase<TInput, TOutput>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(FastMarchingBaseTestHelper);
+  ITK_DISALLOW_COPY_AND_MOVE(FastMarchingBaseTestHelper);
 
   using Self = FastMarchingBaseTestHelper;
   using Superclass = FastMarchingBase<TInput, TOutput>;
diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingStoppingCriterionBaseTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingStoppingCriterionBaseTest.cxx
index 36d716660c0..aab2a1a2cfb 100644
--- a/Modules/Filtering/FastMarching/test/itkFastMarchingStoppingCriterionBaseTest.cxx
+++ b/Modules/Filtering/FastMarching/test/itkFastMarchingStoppingCriterionBaseTest.cxx
@@ -24,7 +24,7 @@ template <typename TInput, typename TOutput>
 class FastMarchingStoppingCriterionBaseHelperTest : public FastMarchingStoppingCriterionBase<TInput, TOutput>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(FastMarchingStoppingCriterionBaseHelperTest);
+  ITK_DISALLOW_COPY_AND_MOVE(FastMarchingStoppingCriterionBaseHelperTest);
 
   using Self = FastMarchingStoppingCriterionBaseHelperTest;
   using Superclass = FastMarchingStoppingCriterionBase<TInput, TOutput>;
diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx
index 0c56568eb54..79a062b06dc 100644
--- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx
+++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx
@@ -27,7 +27,7 @@
 class ProjectTransform : public itk::Transform<double, 3, 2>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ProjectTransform);
+  ITK_DISALLOW_COPY_AND_MOVE(ProjectTransform);
 
   using Self = ProjectTransform;
   using Superclass = itk::Transform<double, 3, 2>;
diff --git a/Modules/IO/HDF5/test/itkHDF5ImageIOStreamingReadWriteTest.cxx b/Modules/IO/HDF5/test/itkHDF5ImageIOStreamingReadWriteTest.cxx
index 87f99193e13..aa720e5a04f 100644
--- a/Modules/IO/HDF5/test/itkHDF5ImageIOStreamingReadWriteTest.cxx
+++ b/Modules/IO/HDF5/test/itkHDF5ImageIOStreamingReadWriteTest.cxx
@@ -43,7 +43,7 @@ template <class TOutputImage>
 class DemoImageSource : public GenerateImageSource<TOutputImage>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(DemoImageSource);
+  ITK_DISALLOW_COPY_AND_MOVE(DemoImageSource);
 
   /** Standard class type aliases. */
   using Self = DemoImageSource;
diff --git a/Modules/IO/VTK/test/itkVTKImageIOStreamTest.cxx b/Modules/IO/VTK/test/itkVTKImageIOStreamTest.cxx
index 02e3333b78c..cb58fc6097a 100644
--- a/Modules/IO/VTK/test/itkVTKImageIOStreamTest.cxx
+++ b/Modules/IO/VTK/test/itkVTKImageIOStreamTest.cxx
@@ -37,7 +37,7 @@ template <class TOutputImage>
 class ConstantImageSource : public GenerateImageSource<TOutputImage>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ConstantImageSource);
+  ITK_DISALLOW_COPY_AND_MOVE(ConstantImageSource);
 
   /** Standard class type aliases. */
   using Self = ConstantImageSource;
diff --git a/Modules/Nonunit/Review/test/itkImageFunctionTest.cxx b/Modules/Nonunit/Review/test/itkImageFunctionTest.cxx
index 849696e1a9f..d93cea9d3d6 100644
--- a/Modules/Nonunit/Review/test/itkImageFunctionTest.cxx
+++ b/Modules/Nonunit/Review/test/itkImageFunctionTest.cxx
@@ -30,7 +30,7 @@ class TestImageFunction
   : public ImageFunction<TInputImage, typename NumericTraits<typename TInputImage::PixelType>::RealType, TCoordRep>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(TestImageFunction);
+  ITK_DISALLOW_COPY_AND_MOVE(TestImageFunction);
 
   /** Standard class type aliases. */
   using Self = TestImageFunction;
diff --git a/Modules/Nonunit/Review/test/itkRegionBasedLevelSetFunctionTest.cxx b/Modules/Nonunit/Review/test/itkRegionBasedLevelSetFunctionTest.cxx
index 657d816a3f6..3fd650c0672 100644
--- a/Modules/Nonunit/Review/test/itkRegionBasedLevelSetFunctionTest.cxx
+++ b/Modules/Nonunit/Review/test/itkRegionBasedLevelSetFunctionTest.cxx
@@ -27,7 +27,7 @@ template <typename TInput,   // LevelSetImageType
 class RegionBasedLevelSetFunctionTestHelper : public RegionBasedLevelSetFunction<TInput, TFeature, TSharedData>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(RegionBasedLevelSetFunctionTestHelper);
+  ITK_DISALLOW_COPY_AND_MOVE(RegionBasedLevelSetFunctionTestHelper);
 
   /** Standard class type aliases. */
   using Self = RegionBasedLevelSetFunctionTestHelper;
diff --git a/Modules/Nonunit/Review/test/itkScalarChanAndVeseLevelSetFunctionTest1.cxx b/Modules/Nonunit/Review/test/itkScalarChanAndVeseLevelSetFunctionTest1.cxx
index 986cc07b325..7c066c40bf3 100644
--- a/Modules/Nonunit/Review/test/itkScalarChanAndVeseLevelSetFunctionTest1.cxx
+++ b/Modules/Nonunit/Review/test/itkScalarChanAndVeseLevelSetFunctionTest1.cxx
@@ -28,7 +28,7 @@ class ScalarChanAndVeseLevelSetFunctionTestHelper
   : public ScalarChanAndVeseLevelSetFunction<TInput, TFeature, TSharedData>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ScalarChanAndVeseLevelSetFunctionTestHelper);
+  ITK_DISALLOW_COPY_AND_MOVE(ScalarChanAndVeseLevelSetFunctionTestHelper);
 
   /** Standard class type aliases. */
   using Self = ScalarChanAndVeseLevelSetFunctionTestHelper;
diff --git a/Modules/Nonunit/Review/test/itkScalarChanAndVeseLevelSetFunctionTest2.cxx b/Modules/Nonunit/Review/test/itkScalarChanAndVeseLevelSetFunctionTest2.cxx
index 33ba57df2cb..d7621d65b74 100644
--- a/Modules/Nonunit/Review/test/itkScalarChanAndVeseLevelSetFunctionTest2.cxx
+++ b/Modules/Nonunit/Review/test/itkScalarChanAndVeseLevelSetFunctionTest2.cxx
@@ -28,7 +28,7 @@ class ScalarChanAndVeseLevelSetFunctionTest2Helper
   : public ScalarChanAndVeseLevelSetFunction<TInput, TFeature, TSharedData>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ScalarChanAndVeseLevelSetFunctionTest2Helper);
+  ITK_DISALLOW_COPY_AND_MOVE(ScalarChanAndVeseLevelSetFunctionTest2Helper);
 
   /** Standard class type aliases. */
   using Self = ScalarChanAndVeseLevelSetFunctionTest2Helper;
diff --git a/Modules/Nonunit/Review/test/itkScalarRegionBasedLevelSetFunctionTest.cxx b/Modules/Nonunit/Review/test/itkScalarRegionBasedLevelSetFunctionTest.cxx
index c28015ee4f8..3c7fa00c858 100644
--- a/Modules/Nonunit/Review/test/itkScalarRegionBasedLevelSetFunctionTest.cxx
+++ b/Modules/Nonunit/Review/test/itkScalarRegionBasedLevelSetFunctionTest.cxx
@@ -28,7 +28,7 @@ class ScalarRegionBasedLevelSetFunctionTestHelper
   : public ScalarRegionBasedLevelSetFunction<TInput, TFeature, TSharedData>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ScalarRegionBasedLevelSetFunctionTestHelper);
+  ITK_DISALLOW_COPY_AND_MOVE(ScalarRegionBasedLevelSetFunctionTestHelper);
 
   /** Standard class type aliases. */
   using Self = ScalarRegionBasedLevelSetFunctionTestHelper;
diff --git a/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerBasev4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerBasev4Test.cxx
index b9ca100acf4..5099a602ffd 100644
--- a/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerBasev4Test.cxx
+++ b/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerBasev4Test.cxx
@@ -24,7 +24,7 @@ template <typename TFixedObject, typename TMovingObject>
 class GradientDescentOptimizerBasev4TestMetric : public itk::ObjectToObjectMetricBase
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(GradientDescentOptimizerBasev4TestMetric);
+  ITK_DISALLOW_COPY_AND_MOVE(GradientDescentOptimizerBasev4TestMetric);
 
   /** Standard class type aliases. */
   using Self = GradientDescentOptimizerBasev4TestMetric;
@@ -116,7 +116,7 @@ class GradientDescentOptimizerBasev4TestMetric : public itk::ObjectToObjectMetri
 class GradientDescentOptimizerBasev4TestOptimizer : public itk::GradientDescentOptimizerBasev4
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(GradientDescentOptimizerBasev4TestOptimizer);
+  ITK_DISALLOW_COPY_AND_MOVE(GradientDescentOptimizerBasev4TestOptimizer);
 
   /** Standard "Self" type alias. */
   using Self = GradientDescentOptimizerBasev4TestOptimizer;
diff --git a/Modules/Numerics/Optimizersv4/test/itkOptimizerParameterScalesEstimatorTest.cxx b/Modules/Numerics/Optimizersv4/test/itkOptimizerParameterScalesEstimatorTest.cxx
index c98c587e942..173a19fa39c 100644
--- a/Modules/Numerics/Optimizersv4/test/itkOptimizerParameterScalesEstimatorTest.cxx
+++ b/Modules/Numerics/Optimizersv4/test/itkOptimizerParameterScalesEstimatorTest.cxx
@@ -24,7 +24,7 @@
 class OptimizerParameterScalesEstimatorTest : public itk::OptimizerParameterScalesEstimator
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(OptimizerParameterScalesEstimatorTest);
+  ITK_DISALLOW_COPY_AND_MOVE(OptimizerParameterScalesEstimatorTest);
 
   /** Standard class type aliases. */
   using Self = OptimizerParameterScalesEstimatorTest;
diff --git a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesEstimatorTest.cxx b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesEstimatorTest.cxx
index abd2e1d1536..a72c361a35b 100644
--- a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesEstimatorTest.cxx
+++ b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesEstimatorTest.cxx
@@ -128,7 +128,7 @@ template <typename TMetric>
 class RegistrationParameterScalesEstimatorTest : public itk::RegistrationParameterScalesEstimator<TMetric>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(RegistrationParameterScalesEstimatorTest);
+  ITK_DISALLOW_COPY_AND_MOVE(RegistrationParameterScalesEstimatorTest);
 
   /** Standard class type aliases. */
   using Self = RegistrationParameterScalesEstimatorTest;
diff --git a/Modules/Numerics/Statistics/test/itkSampleToSubsampleFilterTest1.cxx b/Modules/Numerics/Statistics/test/itkSampleToSubsampleFilterTest1.cxx
index 626716a9d04..23062e4446e 100644
--- a/Modules/Numerics/Statistics/test/itkSampleToSubsampleFilterTest1.cxx
+++ b/Modules/Numerics/Statistics/test/itkSampleToSubsampleFilterTest1.cxx
@@ -31,7 +31,7 @@ template <typename TSample>
 class SubsamplerTester : public SampleToSubsampleFilter<TSample>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(SubsamplerTester);
+  ITK_DISALLOW_COPY_AND_MOVE(SubsamplerTester);
 
   /** Standard class type aliases. */
   using Self = SubsamplerTester;
diff --git a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx
index 95c4f84839f..1e1ebefcb0a 100644
--- a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx
+++ b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx
@@ -108,7 +108,7 @@ template <typename TFixedImage, typename TMovingImage, typename TVirtualImage>
 class ImageToImageMetricv4TestMetric : public itk::ImageToImageMetricv4<TFixedImage, TMovingImage, TVirtualImage>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ImageToImageMetricv4TestMetric);
+  ITK_DISALLOW_COPY_AND_MOVE(ImageToImageMetricv4TestMetric);
 
   /** Standard class type aliases. */
   using Self = ImageToImageMetricv4TestMetric;
diff --git a/Modules/Registration/Metricsv4/test/itkMetricImageGradientTest.cxx b/Modules/Registration/Metricsv4/test/itkMetricImageGradientTest.cxx
index 1ec417ac16e..7ec78a01fa8 100644
--- a/Modules/Registration/Metricsv4/test/itkMetricImageGradientTest.cxx
+++ b/Modules/Registration/Metricsv4/test/itkMetricImageGradientTest.cxx
@@ -69,7 +69,7 @@ class VanilaImageToImageMetricv4GetValueAndDerivativeThreader
   : public ImageToImageMetricv4GetValueAndDerivativeThreader<TDomainPartitioner, TImageToImageMetric>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VanilaImageToImageMetricv4GetValueAndDerivativeThreader);
+  ITK_DISALLOW_COPY_AND_MOVE(VanilaImageToImageMetricv4GetValueAndDerivativeThreader);
 
   /** Standard class type aliases. */
   using Self = VanilaImageToImageMetricv4GetValueAndDerivativeThreader;
@@ -131,7 +131,7 @@ template <typename TFixedImage, typename TMovingImage, typename TVirtualImage =
 class VanillaImageToImageMetricv4 : public ImageToImageMetricv4<TFixedImage, TMovingImage, TVirtualImage>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VanillaImageToImageMetricv4);
+  ITK_DISALLOW_COPY_AND_MOVE(VanillaImageToImageMetricv4);
 
   /** Standard class type aliases. */
   using Self = VanillaImageToImageMetricv4;
diff --git a/Modules/Segmentation/LevelSets/test/itkLevelSetFunctionTest.cxx b/Modules/Segmentation/LevelSets/test/itkLevelSetFunctionTest.cxx
index 642a1fcd41d..1f48cdccbae 100644
--- a/Modules/Segmentation/LevelSets/test/itkLevelSetFunctionTest.cxx
+++ b/Modules/Segmentation/LevelSets/test/itkLevelSetFunctionTest.cxx
@@ -145,7 +145,7 @@ class MorphFunction : public ::itk::LevelSetFunction<::itk::Image<float, 2>>
 class MorphFilter : public ::itk::DenseFiniteDifferenceImageFilter<::itk::Image<float, 2>, ::itk::Image<float, 2>>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(MorphFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(MorphFilter);
 
   using Self = MorphFilter;
 
diff --git a/Modules/Segmentation/LevelSets/test/itkParallelSparseFieldLevelSetImageFilterTest.cxx b/Modules/Segmentation/LevelSets/test/itkParallelSparseFieldLevelSetImageFilterTest.cxx
index 8a0a6ec309f..fe6ae122c58 100644
--- a/Modules/Segmentation/LevelSets/test/itkParallelSparseFieldLevelSetImageFilterTest.cxx
+++ b/Modules/Segmentation/LevelSets/test/itkParallelSparseFieldLevelSetImageFilterTest.cxx
@@ -155,7 +155,7 @@ class MorphFunction : public ::itk::LevelSetFunction<::itk::Image<float, 3>>
 class MorphFilter : public ::itk::ParallelSparseFieldLevelSetImageFilter<::itk::Image<float, 3>, ::itk::Image<float, 3>>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(MorphFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(MorphFilter);
 
   using Self = MorphFilter;
 
diff --git a/Utilities/Doxygen/doxygen.config.in b/Utilities/Doxygen/doxygen.config.in
index 9abbfcf6cad..644994ca774 100644
--- a/Utilities/Doxygen/doxygen.config.in
+++ b/Utilities/Doxygen/doxygen.config.in
@@ -2199,6 +2199,7 @@ PREDEFINED             = "itkNotUsed(x)=" \
                          "ITK_OVERRIDE= override " \
                          "ITK_NULLPTR=  nullptr " \
                          "ITK_NOEXCEPT= noexcept " \
+                         "ITK_DISALLOW_COPY_AND_MOVE(type)=" \
                          "ITK_DISALLOW_COPY_AND_ASSIGN(type)=" \
                          "ITK_FORCE_EXPORT_MACRO(X)="
 
diff --git a/Utilities/ITKv5Preparation/Move_DISALLOW_COPY_to_public_section.cpp b/Utilities/ITKv5Preparation/Move_DISALLOW_COPY_to_public_section.cpp
index c4af01379c4..8b9e363019e 100644
--- a/Utilities/ITKv5Preparation/Move_DISALLOW_COPY_to_public_section.cpp
+++ b/Utilities/ITKv5Preparation/Move_DISALLOW_COPY_to_public_section.cpp
@@ -2,7 +2,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
 
-/* Script to move ITK_DISALLOW_COPY_AND_ASSIGN calls to the public section
+/* Script to move ITK_DISALLOW_COPY_AND_MOVE calls to the public section
  * of the classes.
  *
  * Initial version by Niels Dekker, LKEB, Leiden University Medical Center, 2018
@@ -167,7 +167,8 @@ namespace
           }
           else
           {
-            if (StringStartsWithPrefix(c_str, "ITK_DISALLOW_COPY_AND_ASSIGN("))
+            if (StringStartsWithPrefix(c_str, "ITK_DISALLOW_COPY_AND_MOVE(")
+                || StringStartsWithPrefix(c_str, "ITK_DISALLOW_COPY_AND_ASSIGN("))
             {
               ++statistics.numberOfDisallowMacroCalls;