Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Examples/Filtering/CompositeFilterExample.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/Common/src/itkExceptionObject.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/test/itkCompensatedSummationTest2.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/test/itkDataObjectTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/Common/test/itkFactoryTestLib.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/test/itkFilterDispatchTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/test/itkNeighborhoodAllocatorGTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
6 changes: 3 additions & 3 deletions Modules/Core/Common/test/itkObjectFactoryTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/test/itkObjectFactoryTest3.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/Common/test/itkSmartPointerGTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Transform/test/itkMultiTransformTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Modules/IO/VTK/test/itkVTKImageIOStreamTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Nonunit/Review/test/itkImageFunctionTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading