Move ITK_DISSALLOW_COPY_AND_ASSIGN to public

Using: https://gist.github.com/N-Dekker/a46cd003f19a84c6d285c2487fc5e13d#file-move_disallow_copy_to_public_section-cpp with: ```bash g++ Move_DISALLOW_COPY_to_public_section.cpp -lstdc++fs ``` ```bash clang++ Move_DISALLOW_COPY_to_public_section.cpp -lstdc++fs ```
InsightSoftwareConsortium · Mar 28, 2018 · 3702105 · 3702105
1 parent b1c04cb
commit 3702105
Show file tree

Hide file tree

Showing 28 changed files with 56 additions and 56 deletions.
diff --git a/include/itkExpandWithZerosImageFilter.h b/include/itkExpandWithZerosImageFilter.h
@@ -64,6 +64,8 @@ class ExpandWithZerosImageFilter:
   public ImageToImageFilter< TInputImage, TOutputImage >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(ExpandWithZerosImageFilter);
+
   /** Standard class type alias. */
   using Self = ExpandWithZerosImageFilter;
   using Superclass = ImageToImageFilter< TInputImage, TOutputImage >;
@@ -149,8 +151,6 @@ class ExpandWithZerosImageFilter:
   void BeforeThreadedGenerateData() override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ExpandWithZerosImageFilter);
-
   ExpandFactorsType m_ExpandFactors;
 };
 } // end namespace itk

diff --git a/include/itkFFTPadPositiveIndexImageFilter.h b/include/itkFFTPadPositiveIndexImageFilter.h
@@ -54,6 +54,8 @@ class FFTPadPositiveIndexImageFilter:
   public ImageToImageFilter<TInputImage, TOutputImage>
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(FFTPadPositiveIndexImageFilter);
+
   /** Standard class type alias. */
   using Self = FFTPadPositiveIndexImageFilter;
   using Superclass = ImageToImageFilter<TInputImage, TOutputImage>;
@@ -112,7 +114,6 @@ class FFTPadPositiveIndexImageFilter:
   void GenerateData() override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(FFTPadPositiveIndexImageFilter);
   typename FFTPadFilterType::Pointer     m_FFTPadFilter;
   typename ChangeInfoFilterType::Pointer m_ChangeInfoFilter;
   SizeValueType                          m_SizeGreatestPrimeFactor;

diff --git a/include/itkFrequencyBandImageFilter.h b/include/itkFrequencyBandImageFilter.h
@@ -48,6 +48,8 @@ class FrequencyBandImageFilter:
   public ImageToImageFilter<TImageType, TImageType>
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyBandImageFilter);
+
   /** Standard class type alias. */
   using Self = FrequencyBandImageFilter;
   using Superclass = ImageToImageFilter<TImageType, TImageType>;
@@ -184,8 +186,6 @@ class FrequencyBandImageFilter:
                                     ThreadIdType threadId) override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyBandImageFilter);
-
   FrequencyValueType m_LowFrequencyThreshold;
   FrequencyValueType m_HighFrequencyThreshold;
 

diff --git a/include/itkFrequencyExpandImageFilter.h b/include/itkFrequencyExpandImageFilter.h
@@ -102,6 +102,8 @@ class FrequencyExpandImageFilter:
   public ImageToImageFilter< TImageType, TImageType >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyExpandImageFilter);
+
   /** Standard class type alias. */
   using Self = FrequencyExpandImageFilter;
   using Superclass = ImageToImageFilter<TImageType, TImageType>;
@@ -167,8 +169,6 @@ class FrequencyExpandImageFilter:
   void GenerateData() override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyExpandImageFilter);
-
   ExpandFactorsType m_ExpandFactors;
 };
 } // end namespace itk

diff --git a/include/itkFrequencyExpandViaInverseFFTImageFilter.h b/include/itkFrequencyExpandViaInverseFFTImageFilter.h
@@ -51,6 +51,8 @@ class FrequencyExpandViaInverseFFTImageFilter:
   public ImageToImageFilter< TImageType, TImageType >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyExpandViaInverseFFTImageFilter);
+
   /** Standard class type alias. */
   using Self = FrequencyExpandViaInverseFFTImageFilter;
   using Superclass = ImageToImageFilter<TImageType, TImageType>;
@@ -122,8 +124,6 @@ class FrequencyExpandViaInverseFFTImageFilter:
   void GenerateData() override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyExpandViaInverseFFTImageFilter);
-
   ExpandFactorsType                             m_ExpandFactors;
   typename InverseFFTFilterType::Pointer        m_InverseFFT;
   typename ForwardFFTFilterType::Pointer        m_ForwardFFT;

diff --git a/include/itkFrequencyFunction.h b/include/itkFrequencyFunction.h
@@ -36,6 +36,8 @@ class FrequencyFunction:
   public SpatialFunction< TFunctionValue, VImageDimension, TInput >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyFunction);
+
   /** Standard class type alias. */
   using Self = FrequencyFunction;
   using Superclass = SpatialFunction< TFunctionValue, VImageDimension, TInput >;
@@ -70,9 +72,6 @@ class FrequencyFunction:
   {
     Superclass::PrintSelf(os, indent);
   }
-
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyFunction);
 };
 } // end namespace itk
 

diff --git a/include/itkFrequencyShrinkImageFilter.h b/include/itkFrequencyShrinkImageFilter.h
@@ -78,6 +78,8 @@ class FrequencyShrinkImageFilter:
   public ImageToImageFilter<TImageType, TImageType>
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyShrinkImageFilter);
+
   /** Standard class type alias. */
   using Self = FrequencyShrinkImageFilter;
   using Superclass = ImageToImageFilter<TImageType, TImageType>;
@@ -146,8 +148,6 @@ class FrequencyShrinkImageFilter:
   void GenerateData() override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyShrinkImageFilter);
-
   ShrinkFactorsType                         m_ShrinkFactors;
   bool                                      m_ApplyBandFilter;
   typename FrequencyBandFilterType::Pointer m_FrequencyBandFilter;

diff --git a/include/itkFrequencyShrinkViaInverseFFTImageFilter.h b/include/itkFrequencyShrinkViaInverseFFTImageFilter.h
@@ -43,6 +43,8 @@ class FrequencyShrinkViaInverseFFTImageFilter:
   public ImageToImageFilter<TImageType, TImageType>
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyShrinkViaInverseFFTImageFilter);
+
   /** Standard class type alias. */
   using Self = FrequencyShrinkViaInverseFFTImageFilter;
   using Superclass = ImageToImageFilter<TImageType, TImageType>;
@@ -111,8 +113,6 @@ class FrequencyShrinkViaInverseFFTImageFilter:
   void GenerateData() override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(FrequencyShrinkViaInverseFFTImageFilter);
-
   ShrinkFactorsType                             m_ShrinkFactors;
   typename InverseFFTFilterType::Pointer        m_InverseFFT;
   typename ForwardFFTFilterType::Pointer        m_ForwardFFT;

diff --git a/include/itkHeldIsotropicWavelet.h b/include/itkHeldIsotropicWavelet.h
@@ -46,6 +46,8 @@ class HeldIsotropicWavelet:
   public IsotropicWaveletFrequencyFunction< TFunctionValue, VImageDimension, TInput >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(HeldIsotropicWavelet);
+
   /** Standard class type alias. */
   using Self = HeldIsotropicWavelet;
   using Superclass = IsotropicWaveletFrequencyFunction< TFunctionValue, VImageDimension, TInput >;
@@ -83,8 +85,6 @@ class HeldIsotropicWavelet:
   void PrintSelf(std::ostream & os, Indent indent) const override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(HeldIsotropicWavelet);
-
   /** The order of the polynom. */
   unsigned int m_PolynomialOrder;
 };

diff --git a/include/itkIsotropicFrequencyFunction.h b/include/itkIsotropicFrequencyFunction.h
@@ -40,6 +40,8 @@ class IsotropicFrequencyFunction:
   public FrequencyFunction< TFunctionValue, VImageDimension, TInput >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(IsotropicFrequencyFunction);
+
   /** Standard class type alias. */
   using Self = IsotropicFrequencyFunction;
   using Superclass = FrequencyFunction< TFunctionValue, VImageDimension, TInput >;
@@ -88,9 +90,6 @@ class IsotropicFrequencyFunction:
   {
     Superclass::PrintSelf(os, indent);
   }
-
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(IsotropicFrequencyFunction);
 };
 } // end namespace itk
 

diff --git a/include/itkIsotropicWaveletFrequencyFunction.h b/include/itkIsotropicWaveletFrequencyFunction.h
@@ -57,6 +57,8 @@ class IsotropicWaveletFrequencyFunction:
   public IsotropicFrequencyFunction< TFunctionValue, VImageDimension, TInput >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(IsotropicWaveletFrequencyFunction);
+
   /** Standard class type alias. */
   using Self = IsotropicWaveletFrequencyFunction;
   using Superclass = IsotropicFrequencyFunction< TFunctionValue, VImageDimension, TInput >;
@@ -116,9 +118,6 @@ class IsotropicWaveletFrequencyFunction:
 
   unsigned int      m_HighPassSubBands;
   FunctionValueType m_FreqCutOff;
-
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(IsotropicWaveletFrequencyFunction);
 };
 } // end namespace itk
 

diff --git a/include/itkMonogenicSignalFrequencyImageFilter.h b/include/itkMonogenicSignalFrequencyImageFilter.h
@@ -48,6 +48,8 @@ class MonogenicSignalFrequencyImageFilter:
       TInputImage::ImageDimension> >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(MonogenicSignalFrequencyImageFilter);
+
   /** Standard class type alias. */
   using Self = MonogenicSignalFrequencyImageFilter;
   using Superclass = ImageToImageFilter< TInputImage, VectorImage<typename TInputImage::PixelType,
@@ -95,7 +97,6 @@ class MonogenicSignalFrequencyImageFilter:
                                      ThreadIdType threadId) override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(MonogenicSignalFrequencyImageFilter);
   RieszFunctionPointer m_Evaluator;
 };
 } // end namespace itk

diff --git a/include/itkPhaseAnalysisImageFilter.h b/include/itkPhaseAnalysisImageFilter.h
@@ -67,6 +67,8 @@ class PhaseAnalysisImageFilter:
   public ImageToImageFilter< TInputImage, TOutputImage >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(PhaseAnalysisImageFilter);
+
   /** Standard class type alias. */
   using Self = PhaseAnalysisImageFilter;
   using Superclass = ImageToImageFilter<TInputImage, TOutputImage >;
@@ -176,9 +178,6 @@ class PhaseAnalysisImageFilter:
       }
     return out;
   }
-
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(PhaseAnalysisImageFilter);
 };
 } // end namespace itk
 #ifndef ITK_MANUAL_INSTANTIATION

diff --git a/include/itkPhaseAnalysisSoftThresholdImageFilter.h b/include/itkPhaseAnalysisSoftThresholdImageFilter.h
@@ -46,6 +46,8 @@ class PhaseAnalysisSoftThresholdImageFilter:
   public PhaseAnalysisImageFilter< TInputImage, TOutputImage >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(PhaseAnalysisSoftThresholdImageFilter);
+
   /** Standard class type alias. */
   using Self = PhaseAnalysisSoftThresholdImageFilter;
   using Superclass = PhaseAnalysisImageFilter<TInputImage, TOutputImage >;
@@ -107,7 +109,6 @@ class PhaseAnalysisSoftThresholdImageFilter:
                                     ThreadIdType threadId) override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(PhaseAnalysisSoftThresholdImageFilter);
   bool                 m_ApplySoftThreshold;
   OutputImagePixelType m_NumOfSigmas;
   OutputImagePixelType m_MeanAmp;

diff --git a/include/itkRieszFrequencyFilterBankGenerator.h b/include/itkRieszFrequencyFilterBankGenerator.h
@@ -43,6 +43,8 @@ class RieszFrequencyFilterBankGenerator:
   public itk::GenerateImageSource< TOutputImage >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(RieszFrequencyFilterBankGenerator);
+
   /** Standard type alias */
   using Self = RieszFrequencyFilterBankGenerator;
   using Superclass = itk::GenerateImageSource<TOutputImage>;
@@ -116,7 +118,6 @@ class RieszFrequencyFilterBankGenerator:
   void GenerateData() override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(RieszFrequencyFilterBankGenerator);
   unsigned int         m_Order;
   RieszFunctionPointer m_Evaluator;
 }; // end of class

diff --git a/include/itkRieszFrequencyFunction.h b/include/itkRieszFrequencyFunction.h
@@ -40,6 +40,8 @@ class RieszFrequencyFunction:
   public FrequencyFunction< TFunctionValue, VImageDimension, TInput >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(RieszFrequencyFunction);
+
   /** Standard class type alias. */
   using Self = RieszFrequencyFunction;
   using Superclass = SpatialFunction< TFunctionValue, VImageDimension, TInput >;
@@ -196,7 +198,6 @@ class RieszFrequencyFunction:
   void PrintSelf(std::ostream & os, Indent indent) const override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(RieszFrequencyFunction);
   unsigned int m_Order;
   SetType      m_Indices;
 };

diff --git a/include/itkShannonIsotropicWavelet.h b/include/itkShannonIsotropicWavelet.h
@@ -48,6 +48,8 @@ class ShannonIsotropicWavelet:
   public IsotropicWaveletFrequencyFunction< TFunctionValue, VImageDimension, TInput >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(ShannonIsotropicWavelet);
+
   /** Standard class type alias. */
   using Self = ShannonIsotropicWavelet;
   using Superclass = IsotropicWaveletFrequencyFunction< TFunctionValue, VImageDimension, TInput >;
@@ -73,9 +75,6 @@ class ShannonIsotropicWavelet:
   ShannonIsotropicWavelet();
   ~ShannonIsotropicWavelet() override;
   void PrintSelf(std::ostream & os, Indent indent) const override;
-
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ShannonIsotropicWavelet);
 };
 } // end namespace itk
 

diff --git a/include/itkShrinkDecimateImageFilter.h b/include/itkShrinkDecimateImageFilter.h
@@ -43,6 +43,8 @@ class ShrinkDecimateImageFilter:
   public ImageToImageFilter<TInputImage, TOutputImage>
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(ShrinkDecimateImageFilter);
+
   /** Standard class type alias. */
   using Self = ShrinkDecimateImageFilter;
   using Superclass = ImageToImageFilter<TInputImage, TOutputImage>;
@@ -111,8 +113,6 @@ class ShrinkDecimateImageFilter:
                             ThreadIdType threadId ) override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ShrinkDecimateImageFilter);
-
   ShrinkFactorsType m_ShrinkFactors;
 
   /** Round different pixel types. */

diff --git a/include/itkSimoncelliIsotropicWavelet.h b/include/itkSimoncelliIsotropicWavelet.h
@@ -53,6 +53,8 @@ class SimoncelliIsotropicWavelet:
   public IsotropicWaveletFrequencyFunction< TFunctionValue, VImageDimension, TInput >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(SimoncelliIsotropicWavelet);
+
   /** Standard class type alias. */
   using Self = SimoncelliIsotropicWavelet;
   using Superclass = IsotropicWaveletFrequencyFunction< TFunctionValue, VImageDimension, TInput >;
@@ -78,9 +80,6 @@ class SimoncelliIsotropicWavelet:
   SimoncelliIsotropicWavelet();
   ~SimoncelliIsotropicWavelet() override;
   void PrintSelf(std::ostream & os, Indent indent) const override;
-
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(SimoncelliIsotropicWavelet);
 };
 } // end namespace itk
 

diff --git a/include/itkStructureTensor.h b/include/itkStructureTensor.h
@@ -83,6 +83,8 @@ class StructureTensor:
   public ImageToImageFilter< TInputImage, TOutputImage >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(StructureTensor);
+
   /** Some convenient type alias. */
   /** Standard class type alias. */
   using Self = StructureTensor;
@@ -200,7 +202,6 @@ class StructureTensor:
   }
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(StructureTensor);
   unsigned int                         m_GaussianWindowRadius;
   FloatType                            m_GaussianWindowSigma;
   typename GaussianSourceType::Pointer m_GaussianSource;

diff --git a/include/itkVectorInverseFFTImageFilter.h b/include/itkVectorInverseFFTImageFilter.h
@@ -46,6 +46,8 @@ class VectorInverseFFTImageFilter:
   public ImageToImageFilter< TInputImage, TOutputImage >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(VectorInverseFFTImageFilter);
+
   /** Standard class type alias. */
   using InputImageType = TInputImage;
   using InputPixelType = typename InputImageType::PixelType;
@@ -73,9 +75,6 @@ class VectorInverseFFTImageFilter:
   void GenerateData() override;
 
   void PrintSelf(std::ostream & os, Indent indent) const override;
-
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VectorInverseFFTImageFilter);
 };
 } // end namespace itk
 #ifndef ITK_MANUAL_INSTANTIATION

diff --git a/include/itkVowIsotropicWavelet.h b/include/itkVowIsotropicWavelet.h
@@ -52,6 +52,8 @@ class VowIsotropicWavelet:
   public IsotropicWaveletFrequencyFunction< TFunctionValue, VImageDimension, TInput >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(VowIsotropicWavelet);
+
   /** Standard class type alias. */
   using Self = VowIsotropicWavelet;
   using Superclass = IsotropicWaveletFrequencyFunction< TFunctionValue, VImageDimension, TInput >;
@@ -86,8 +88,6 @@ class VowIsotropicWavelet:
   void PrintSelf(std::ostream & os, Indent indent) const override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(VowIsotropicWavelet);
-
   /** kappa value, default is optimal:0.75 */
   FunctionValueType m_Kappa;
 };