STYLE: Rename ITK_DISALLOW_COPY_AND_ASSIGN to ITK_DISALLOW_COPY_AND_MOVE

mseng10 · hjmjohnson · commit f9db4b9a0149 · 2020-12-17T09:48:19.000-06:00
Fixes changes made in #2053. ITK_DISALLOW_COPY_AND_ASSIGN will be used if ITK_FUTURE_LEGACY_REMOVE=OFF.
diff --git a/include/itkContinuousBorderWarpImageFilter.h b/include/itkContinuousBorderWarpImageFilter.h
@@ -59,7 +59,7 @@ template <typename TInputImage, typename TOutputImage, typename TDisplacementFie
 class ContinuousBorderWarpImageFilter : public WarpImageFilter<TInputImage, TOutputImage, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ContinuousBorderWarpImageFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(ContinuousBorderWarpImageFilter);
 
   /** Standard class type alias. */
   using Self = ContinuousBorderWarpImageFilter;
diff --git a/include/itkVariationalDiffeomorphicRegistrationFilter.h b/include/itkVariationalDiffeomorphicRegistrationFilter.h
@@ -83,7 +83,7 @@ class VariationalDiffeomorphicRegistrationFilter
   : public VariationalRegistrationFilter<TFixedImage, TMovingImage, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalDiffeomorphicRegistrationFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalDiffeomorphicRegistrationFilter);
 
   /** Standard class type alias */
   using Self = VariationalDiffeomorphicRegistrationFilter;
diff --git a/include/itkVariationalRegistrationCurvatureRegularizer.h b/include/itkVariationalRegistrationCurvatureRegularizer.h
@@ -63,7 +63,7 @@ template <typename TDisplacementField>
 class VariationalRegistrationCurvatureRegularizer : public VariationalRegistrationRegularizer<TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationCurvatureRegularizer);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationCurvatureRegularizer);
 
   /** Standard class type alias */
   using Self = VariationalRegistrationCurvatureRegularizer;
diff --git a/include/itkVariationalRegistrationDemonsFunction.h b/include/itkVariationalRegistrationDemonsFunction.h
@@ -57,7 +57,7 @@ class VariationalRegistrationDemonsFunction
   : public VariationalRegistrationFunction<TFixedImage, TMovingImage, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationDemonsFunction);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationDemonsFunction);
 
   /** Standard class type alias. */
   using Self = VariationalRegistrationDemonsFunction;
diff --git a/include/itkVariationalRegistrationDiffusionRegularizer.h b/include/itkVariationalRegistrationDiffusionRegularizer.h
@@ -51,7 +51,7 @@ template <typename TDisplacementField>
 class VariationalRegistrationDiffusionRegularizer : public VariationalRegistrationRegularizer<TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationDiffusionRegularizer);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationDiffusionRegularizer);
 
   /** Standard class type alias */
   using Self = VariationalRegistrationDiffusionRegularizer;
diff --git a/include/itkVariationalRegistrationElasticRegularizer.h b/include/itkVariationalRegistrationElasticRegularizer.h
@@ -59,7 +59,7 @@ template <typename TDisplacementField>
 class VariationalRegistrationElasticRegularizer : public VariationalRegistrationRegularizer<TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationElasticRegularizer);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationElasticRegularizer);
 
   /** Standard class type alias */
   using Self = VariationalRegistrationElasticRegularizer;
diff --git a/include/itkVariationalRegistrationFastNCCFunction.h b/include/itkVariationalRegistrationFastNCCFunction.h
@@ -66,7 +66,7 @@ class VariationalRegistrationFastNCCFunction
   : public VariationalRegistrationNCCFunction<TFixedImage, TMovingImage, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationFastNCCFunction);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationFastNCCFunction);
 
   /** Standard class type alias. */
   using Self = VariationalRegistrationFastNCCFunction;
diff --git a/include/itkVariationalRegistrationFilter.h b/include/itkVariationalRegistrationFilter.h
@@ -99,7 +99,7 @@ template <typename TFixedImage, typename TMovingImage, typename TDisplacementFie
 class VariationalRegistrationFilter : public DenseFiniteDifferenceImageFilter<TDisplacementField, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationFilter);
 
   /** Standard class type alias */
   using Self = VariationalRegistrationFilter;
diff --git a/include/itkVariationalRegistrationFunction.h b/include/itkVariationalRegistrationFunction.h
@@ -52,7 +52,7 @@ template <typename TFixedImage, typename TMovingImage, typename TDisplacementFie
 class VariationalRegistrationFunction : public FiniteDifferenceFunction<TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationFunction);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationFunction);
 
   /** Standard class type alias. */
   using Self = VariationalRegistrationFunction;
diff --git a/include/itkVariationalRegistrationGaussianRegularizer.h b/include/itkVariationalRegistrationGaussianRegularizer.h
@@ -47,7 +47,7 @@ template <typename TDisplacementField>
 class VariationalRegistrationGaussianRegularizer : public VariationalRegistrationRegularizer<TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationGaussianRegularizer);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationGaussianRegularizer);
 
   /** Standard class type alias */
   using Self = VariationalRegistrationGaussianRegularizer;
diff --git a/include/itkVariationalRegistrationLogger.h b/include/itkVariationalRegistrationLogger.h
@@ -47,7 +47,7 @@ template <typename TRegistrationFilter, typename TMRFilter>
 class VariationalRegistrationLogger : public Command
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationLogger);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationLogger);
 
   /** Standard class type alias. */
   using Self = VariationalRegistrationLogger;
diff --git a/include/itkVariationalRegistrationMultiResolutionFilter.h b/include/itkVariationalRegistrationMultiResolutionFilter.h
@@ -81,7 +81,7 @@ template <typename TFixedImage, typename TMovingImage, typename TDisplacementFie
 class VariationalRegistrationMultiResolutionFilter : public ImageToImageFilter<TDisplacementField, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationMultiResolutionFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationMultiResolutionFilter);
 
   /** Standard class type alias */
   using Self = VariationalRegistrationMultiResolutionFilter;
diff --git a/include/itkVariationalRegistrationNCCFunction.h b/include/itkVariationalRegistrationNCCFunction.h
@@ -66,7 +66,7 @@ class VariationalRegistrationNCCFunction
   : public VariationalRegistrationFunction<TFixedImage, TMovingImage, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationNCCFunction);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationNCCFunction);
 
   /** Standard class type alias. */
   using Self = VariationalRegistrationNCCFunction;
diff --git a/include/itkVariationalRegistrationRegularizer.h b/include/itkVariationalRegistrationRegularizer.h
@@ -47,7 +47,7 @@ template <typename TDisplacementField>
 class VariationalRegistrationRegularizer : public InPlaceImageFilter<TDisplacementField, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationRegularizer);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationRegularizer);
 
   /** Standard class type alias */
   using Self = VariationalRegistrationRegularizer;
diff --git a/include/itkVariationalRegistrationSSDFunction.h b/include/itkVariationalRegistrationSSDFunction.h
@@ -54,7 +54,7 @@ class VariationalRegistrationSSDFunction
   : public VariationalRegistrationFunction<TFixedImage, TMovingImage, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationSSDFunction);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationSSDFunction);
 
   /** Standard class type alias. */
   using Self = VariationalRegistrationSSDFunction;
diff --git a/include/itkVariationalRegistrationStopCriterion.h b/include/itkVariationalRegistrationStopCriterion.h
@@ -69,7 +69,7 @@ template <typename TRegistrationFilter, typename TMRFilter>
 class VariationalRegistrationStopCriterion : public Command
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationStopCriterion);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationStopCriterion);
 
   /** Standard class type alias. */
   using Self = VariationalRegistrationStopCriterion;
diff --git a/include/itkVariationalSymmetricDiffeomorphicRegistrationFilter.h b/include/itkVariationalSymmetricDiffeomorphicRegistrationFilter.h
@@ -92,7 +92,7 @@ class VariationalSymmetricDiffeomorphicRegistrationFilter
   : public VariationalDiffeomorphicRegistrationFilter<TFixedImage, TMovingImage, TDisplacementField>
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VariationalSymmetricDiffeomorphicRegistrationFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(VariationalSymmetricDiffeomorphicRegistrationFilter);
 
   /** Standard class type alias */
   using Self = VariationalSymmetricDiffeomorphicRegistrationFilter;

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ template <typename TInputImage, typename TOutputImage, typename TDisplacementFie`
`59`	`59`	`class ContinuousBorderWarpImageFilter : public WarpImageFilter<TInputImage, TOutputImage, TDisplacementField>`
`60`	`60`	`{`
`61`	`61`	`public:`
`62`		`- ITK_DISALLOW_COPY_AND_ASSIGN(ContinuousBorderWarpImageFilter);`
	`62`	`+ ITK_DISALLOW_COPY_AND_MOVE(ContinuousBorderWarpImageFilter);`
`63`	`63`
`64`	`64`	`/** Standard class type alias. */`
`65`	`65`	`using Self = ContinuousBorderWarpImageFilter;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class VariationalDiffeomorphicRegistrationFilter`
`83`	`83`	`: public VariationalRegistrationFilter<TFixedImage, TMovingImage, TDisplacementField>`
`84`	`84`	`{`
`85`	`85`	`public:`
`86`		`- ITK_DISALLOW_COPY_AND_ASSIGN(VariationalDiffeomorphicRegistrationFilter);`
	`86`	`+ ITK_DISALLOW_COPY_AND_MOVE(VariationalDiffeomorphicRegistrationFilter);`
`87`	`87`
`88`	`88`	`/** Standard class type alias */`
`89`	`89`	`using Self = VariationalDiffeomorphicRegistrationFilter;`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ template <typename TDisplacementField>`
`63`	`63`	`class VariationalRegistrationCurvatureRegularizer : public VariationalRegistrationRegularizer<TDisplacementField>`
`64`	`64`	`{`
`65`	`65`	`public:`
`66`		`- ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationCurvatureRegularizer);`
	`66`	`+ ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationCurvatureRegularizer);`
`67`	`67`
`68`	`68`	`/** Standard class type alias */`
`69`	`69`	`using Self = VariationalRegistrationCurvatureRegularizer;`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class VariationalRegistrationDemonsFunction`
`57`	`57`	`: public VariationalRegistrationFunction<TFixedImage, TMovingImage, TDisplacementField>`
`58`	`58`	`{`
`59`	`59`	`public:`
`60`		`- ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationDemonsFunction);`
	`60`	`+ ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationDemonsFunction);`
`61`	`61`
`62`	`62`	`/** Standard class type alias. */`
`63`	`63`	`using Self = VariationalRegistrationDemonsFunction;`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ template <typename TDisplacementField>`
`51`	`51`	`class VariationalRegistrationDiffusionRegularizer : public VariationalRegistrationRegularizer<TDisplacementField>`
`52`	`52`	`{`
`53`	`53`	`public:`
`54`		`- ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationDiffusionRegularizer);`
	`54`	`+ ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationDiffusionRegularizer);`
`55`	`55`
`56`	`56`	`/** Standard class type alias */`
`57`	`57`	`using Self = VariationalRegistrationDiffusionRegularizer;`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ template <typename TDisplacementField>`
`59`	`59`	`class VariationalRegistrationElasticRegularizer : public VariationalRegistrationRegularizer<TDisplacementField>`
`60`	`60`	`{`
`61`	`61`	`public:`
`62`		`- ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationElasticRegularizer);`
	`62`	`+ ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationElasticRegularizer);`
`63`	`63`
`64`	`64`	`/** Standard class type alias */`
`65`	`65`	`using Self = VariationalRegistrationElasticRegularizer;`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class VariationalRegistrationFastNCCFunction`
`66`	`66`	`: public VariationalRegistrationNCCFunction<TFixedImage, TMovingImage, TDisplacementField>`
`67`	`67`	`{`
`68`	`68`	`public:`
`69`		`- ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationFastNCCFunction);`
	`69`	`+ ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationFastNCCFunction);`
`70`	`70`
`71`	`71`	`/** Standard class type alias. */`
`72`	`72`	`using Self = VariationalRegistrationFastNCCFunction;`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ template <typename TFixedImage, typename TMovingImage, typename TDisplacementFie`
`99`	`99`	`class VariationalRegistrationFilter : public DenseFiniteDifferenceImageFilter<TDisplacementField, TDisplacementField>`
`100`	`100`	`{`
`101`	`101`	`public:`
`102`		`- ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationFilter);`
	`102`	`+ ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationFilter);`
`103`	`103`
`104`	`104`	`/** Standard class type alias */`
`105`	`105`	`using Self = VariationalRegistrationFilter;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ template <typename TFixedImage, typename TMovingImage, typename TDisplacementFie`
`52`	`52`	`class VariationalRegistrationFunction : public FiniteDifferenceFunction<TDisplacementField>`
`53`	`53`	`{`
`54`	`54`	`public:`
`55`		`- ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationFunction);`
	`55`	`+ ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationFunction);`
`56`	`56`
`57`	`57`	`/** Standard class type alias. */`
`58`	`58`	`using Self = VariationalRegistrationFunction;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ template <typename TDisplacementField>`
`47`	`47`	`class VariationalRegistrationGaussianRegularizer : public VariationalRegistrationRegularizer<TDisplacementField>`
`48`	`48`	`{`
`49`	`49`	`public:`
`50`		`- ITK_DISALLOW_COPY_AND_ASSIGN(VariationalRegistrationGaussianRegularizer);`
	`50`	`+ ITK_DISALLOW_COPY_AND_MOVE(VariationalRegistrationGaussianRegularizer);`
`51`	`51`
`52`	`52`	`/** Standard class type alias */`
`53`	`53`	`using Self = VariationalRegistrationGaussianRegularizer;`