diff --git a/CMake/vtkSlicerObjectFactory.h.in b/CMake/vtkSlicerObjectFactory.h.in index 1db0f552808..202dd0594b6 100644 --- a/CMake/vtkSlicerObjectFactory.h.in +++ b/CMake/vtkSlicerObjectFactory.h.in @@ -35,8 +35,8 @@ protected: @vtk-module@ObjectFactory(); private: - @vtk-module@ObjectFactory(const @vtk-module@ObjectFactory&) VTK_DELETE_FUNCTION; - void operator=(const @vtk-module@ObjectFactory&) VTK_DELETE_FUNCTION; + @vtk-module@ObjectFactory(const @vtk-module@ObjectFactory&) = delete; + void operator=(const @vtk-module@ObjectFactory&) = delete; }; #endif // __@vtk-module@ObjectFactory_h diff --git a/Libs/FreeSurfer/vtkFSSurfaceHelper.h b/Libs/FreeSurfer/vtkFSSurfaceHelper.h index 36c7237e463..9c36accb4d6 100644 --- a/Libs/FreeSurfer/vtkFSSurfaceHelper.h +++ b/Libs/FreeSurfer/vtkFSSurfaceHelper.h @@ -37,6 +37,10 @@ class VTK_FreeSurfer_EXPORT vtkFSSurfaceHelper: public vtkObject protected: vtkFSSurfaceHelper(); + +private: + vtkFSSurfaceHelper(const vtkFSSurfaceHelper&) = delete; + void operator=(const vtkFSSurfaceHelper&) = delete; }; #endif diff --git a/Libs/MRML/Logic/vtkImageLabelOutline.h b/Libs/MRML/Logic/vtkImageLabelOutline.h index f0676d276b6..454a73a2b00 100644 --- a/Libs/MRML/Logic/vtkImageLabelOutline.h +++ b/Libs/MRML/Logic/vtkImageLabelOutline.h @@ -51,6 +51,10 @@ class VTK_MRML_LOGIC_EXPORT vtkImageLabelOutline : public vtkImageNeighborhoodFi void ThreadedExecute(vtkImageData *inData, vtkImageData *outData, int extent[6], int id) override; + +private: + vtkImageLabelOutline(const vtkImageLabelOutline&) = delete; + void operator=(const vtkImageLabelOutline&) = delete; }; #endif diff --git a/Libs/MRML/Logic/vtkImageNeighborhoodFilter.h b/Libs/MRML/Logic/vtkImageNeighborhoodFilter.h index 9242765b5b0..22f7dd260ad 100644 --- a/Libs/MRML/Logic/vtkImageNeighborhoodFilter.h +++ b/Libs/MRML/Logic/vtkImageNeighborhoodFilter.h @@ -63,6 +63,10 @@ class VTK_MRML_LOGIC_EXPORT vtkImageNeighborhoodFilter : public vtkImageSpatialA int Neighbor; unsigned char *Mask; + +private: + vtkImageNeighborhoodFilter(const vtkImageNeighborhoodFilter&) = delete; + void operator=(const vtkImageNeighborhoodFilter&) = delete; }; #endif diff --git a/Libs/vtkITK/vtkITKArchetypeDiffusionTensorImageReaderFile.h b/Libs/vtkITK/vtkITKArchetypeDiffusionTensorImageReaderFile.h index cd600ea344a..2646f0af375 100644 --- a/Libs/vtkITK/vtkITKArchetypeDiffusionTensorImageReaderFile.h +++ b/Libs/vtkITK/vtkITKArchetypeDiffusionTensorImageReaderFile.h @@ -30,6 +30,10 @@ class VTK_ITK_EXPORT vtkITKArchetypeDiffusionTensorImageReaderFile int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; static void ReadProgressCallback(itk::ProcessObject* obj,const itk::ProgressEvent&, void* data); /// private: + +private: + vtkITKArchetypeDiffusionTensorImageReaderFile(const vtkITKArchetypeDiffusionTensorImageReaderFile&) = delete; + void operator=(const vtkITKArchetypeDiffusionTensorImageReaderFile&) = delete; }; #endif diff --git a/Libs/vtkITK/vtkITKArchetypeImageSeriesScalarReader.h b/Libs/vtkITK/vtkITKArchetypeImageSeriesScalarReader.h index c6231f51c57..7f2e76cd623 100644 --- a/Libs/vtkITK/vtkITKArchetypeImageSeriesScalarReader.h +++ b/Libs/vtkITK/vtkITKArchetypeImageSeriesScalarReader.h @@ -34,6 +34,10 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesScalarReader : public vtkITKArche int RequestData(vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) override; static void ReadProgressCallback(itk::ProcessObject* obj,const itk::ProgressEvent&, void* data); /// private: + +private: + vtkITKArchetypeImageSeriesScalarReader(const vtkITKArchetypeImageSeriesScalarReader&) = delete; + void operator=(const vtkITKArchetypeImageSeriesScalarReader&) = delete; }; #endif diff --git a/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderFile.h b/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderFile.h index df5b9cf45de..33c99b7d1f2 100644 --- a/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderFile.h +++ b/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderFile.h @@ -28,7 +28,10 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesVectorReaderFile : public vtkITKA void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) override; static void ReadProgressCallback(itk::ProcessObject* obj,const itk::ProgressEvent&, void* data); - /// private: + +private: + vtkITKArchetypeImageSeriesVectorReaderFile(const vtkITKArchetypeImageSeriesVectorReaderFile&) = delete; + void operator=(const vtkITKArchetypeImageSeriesVectorReaderFile&) = delete; }; #endif diff --git a/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderSeries.h b/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderSeries.h index 77a20c4af1e..39e0fb792d2 100644 --- a/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderSeries.h +++ b/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderSeries.h @@ -33,6 +33,10 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesVectorReaderSeries : public vtkIT ~vtkITKArchetypeImageSeriesVectorReaderSeries() override; void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) override; + +private: + vtkITKArchetypeImageSeriesVectorReaderSeries(const vtkITKArchetypeImageSeriesVectorReaderSeries&) = delete; + void operator=(const vtkITKArchetypeImageSeriesVectorReaderSeries&) = delete; }; #endif diff --git a/Libs/vtkSegmentationCore/vtkBinaryLabelmapToClosedSurfaceConversionRule.h b/Libs/vtkSegmentationCore/vtkBinaryLabelmapToClosedSurfaceConversionRule.h index e27c484ea02..44359674c7d 100644 --- a/Libs/vtkSegmentationCore/vtkBinaryLabelmapToClosedSurfaceConversionRule.h +++ b/Libs/vtkSegmentationCore/vtkBinaryLabelmapToClosedSurfaceConversionRule.h @@ -95,13 +95,15 @@ class vtkSegmentationCore_EXPORT vtkBinaryLabelmapToClosedSurfaceConversionRule protected: vtkBinaryLabelmapToClosedSurfaceConversionRule(); ~vtkBinaryLabelmapToClosedSurfaceConversionRule() override; - void operator=(const vtkBinaryLabelmapToClosedSurfaceConversionRule&); protected: /// Cache for storing merged closed surfaces that have been joint smoothed /// The key used is the binary labelmap representation, which maps to the combined vtkPolyData containing surfaces for all segments in the segmentation std::map > JointSmoothCache; +private: + vtkBinaryLabelmapToClosedSurfaceConversionRule(const vtkBinaryLabelmapToClosedSurfaceConversionRule&) = delete; + void operator=(const vtkBinaryLabelmapToClosedSurfaceConversionRule&) = delete; }; #endif // __vtkBinaryLabelmapToClosedSurfaceConversionRule_h diff --git a/Libs/vtkSegmentationCore/vtkClosedSurfaceToBinaryLabelmapConversionRule.h b/Libs/vtkSegmentationCore/vtkClosedSurfaceToBinaryLabelmapConversionRule.h index 31e4429aabf..ba835a64f2b 100644 --- a/Libs/vtkSegmentationCore/vtkClosedSurfaceToBinaryLabelmapConversionRule.h +++ b/Libs/vtkSegmentationCore/vtkClosedSurfaceToBinaryLabelmapConversionRule.h @@ -109,7 +109,10 @@ class vtkSegmentationCore_EXPORT vtkClosedSurfaceToBinaryLabelmapConversionRule protected: vtkClosedSurfaceToBinaryLabelmapConversionRule(); ~vtkClosedSurfaceToBinaryLabelmapConversionRule() override; - void operator=(const vtkClosedSurfaceToBinaryLabelmapConversionRule&); + +private: + vtkClosedSurfaceToBinaryLabelmapConversionRule(const vtkClosedSurfaceToBinaryLabelmapConversionRule&) = delete; + void operator=(const vtkClosedSurfaceToBinaryLabelmapConversionRule&) = delete; }; #endif // __vtkClosedSurfaceToBinaryLabelmapConversionRule_h diff --git a/Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.h b/Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.h index 92d6772bd2e..e484c8c80b0 100644 --- a/Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.h +++ b/Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.h @@ -84,7 +84,10 @@ class vtkSegmentationCore_EXPORT vtkClosedSurfaceToFractionalLabelmapConversionR vtkClosedSurfaceToFractionalLabelmapConversionRule(); ~vtkClosedSurfaceToFractionalLabelmapConversionRule() override; - void operator=(const vtkClosedSurfaceToFractionalLabelmapConversionRule&); + +private: + vtkClosedSurfaceToFractionalLabelmapConversionRule(const vtkClosedSurfaceToFractionalLabelmapConversionRule&) = delete; + void operator=(const vtkClosedSurfaceToFractionalLabelmapConversionRule&) = delete; }; #endif // __vtkClosedSurfaceToFractionalLabelmapConversionRule_h diff --git a/Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.h b/Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.h index 0249ca63d95..9f03fb96613 100644 --- a/Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.h +++ b/Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.h @@ -79,7 +79,10 @@ class vtkSegmentationCore_EXPORT vtkFractionalLabelmapToClosedSurfaceConversionR protected: vtkFractionalLabelmapToClosedSurfaceConversionRule(); ~vtkFractionalLabelmapToClosedSurfaceConversionRule() override; - void operator=(const vtkFractionalLabelmapToClosedSurfaceConversionRule&); + +private: + vtkFractionalLabelmapToClosedSurfaceConversionRule(const vtkFractionalLabelmapToClosedSurfaceConversionRule&) = delete; + void operator=(const vtkFractionalLabelmapToClosedSurfaceConversionRule&) = delete; }; #endif // __vtkFractionalLabelmapToClosedSurfaceConversionRule_h diff --git a/Libs/vtkSegmentationCore/vtkSegment.h b/Libs/vtkSegmentationCore/vtkSegment.h index 88b5a8ed938..c8243240a9d 100644 --- a/Libs/vtkSegmentationCore/vtkSegment.h +++ b/Libs/vtkSegmentationCore/vtkSegment.h @@ -141,7 +141,6 @@ class vtkSegmentationCore_EXPORT vtkSegment : public vtkObject protected: vtkSegment(); ~vtkSegment() override; - void operator=(const vtkSegment&); protected: /// Stored representations. Map from type string to data object @@ -153,6 +152,10 @@ class vtkSegmentationCore_EXPORT vtkSegment : public vtkObject bool NameAutoGenerated; bool ColorAutoGenerated; int LabelValue; + +private: + vtkSegment(const vtkSegment&) = delete; + void operator=(const vtkSegment&) = delete; }; #endif // __vtkSegment_h diff --git a/Libs/vtkSegmentationCore/vtkSegmentation.h b/Libs/vtkSegmentationCore/vtkSegmentation.h index 772059a5ef3..67f034d7044 100644 --- a/Libs/vtkSegmentationCore/vtkSegmentation.h +++ b/Libs/vtkSegmentationCore/vtkSegmentation.h @@ -512,7 +512,6 @@ class vtkSegmentationCore_EXPORT vtkSegmentation : public vtkObject protected: vtkSegmentation(); ~vtkSegmentation() override; - void operator=(const vtkSegmentation&); protected: /// Container of segments that belong to this segmentation @@ -554,6 +553,10 @@ class vtkSegmentationCore_EXPORT vtkSegmentation : public vtkObject friend class vtkSlicerSegmentationsModuleLogic; friend class vtkSegmentationModifier; friend class qMRMLSegmentEditorWidgetPrivate; + +private: + vtkSegmentation(const vtkSegmentation&) = delete; + void operator=(const vtkSegmentation&) = delete; }; #endif // __vtkSegmentation_h diff --git a/Libs/vtkSegmentationCore/vtkSegmentationConverter.h b/Libs/vtkSegmentationCore/vtkSegmentationConverter.h index d31d90cb48c..470c5fc475c 100644 --- a/Libs/vtkSegmentationCore/vtkSegmentationConverter.h +++ b/Libs/vtkSegmentationCore/vtkSegmentationConverter.h @@ -170,7 +170,6 @@ class vtkSegmentationCore_EXPORT vtkSegmentationConverter : public vtkObject protected: vtkSegmentationConverter(); ~vtkSegmentationConverter() override; - void operator=(const vtkSegmentationConverter&); protected: /// Converter rules. When the class is created it contains just the default converter rules but then @@ -185,6 +184,10 @@ class vtkSegmentationCore_EXPORT vtkSegmentationConverter : public vtkObject /// Source representation to target representation rule graph RepresentationToRepresentationToRuleMapType RulesGraph; + +private: + vtkSegmentationConverter(const vtkSegmentationConverter&) = delete; + void operator=(const vtkSegmentationConverter&) = delete; }; #endif // __vtkSegmentationConverter_h diff --git a/Libs/vtkSegmentationCore/vtkSegmentationHistory.h b/Libs/vtkSegmentationCore/vtkSegmentationHistory.h index bf764fb0a28..6955359ed34 100644 --- a/Libs/vtkSegmentationCore/vtkSegmentationHistory.h +++ b/Libs/vtkSegmentationCore/vtkSegmentationHistory.h @@ -103,7 +103,6 @@ class vtkSegmentationCore_EXPORT vtkSegmentationHistory : public vtkObject protected: vtkSegmentationHistory(); ~vtkSegmentationHistory() override; - void operator=(const vtkSegmentationHistory&); typedef std::map > SegmentsMap; @@ -124,6 +123,10 @@ class vtkSegmentationCore_EXPORT vtkSegmentationHistory : public vtkObject unsigned int LastRestoredState; bool RestoreStateInProgress; + +private: + vtkSegmentationHistory(const vtkSegmentationHistory&) = delete; + void operator=(const vtkSegmentationHistory&) = delete; }; #endif // __vtkSegmentation_h diff --git a/Modules/Loadable/Annotations/Logic/vtkSlicerAnnotationModuleLogic.h b/Modules/Loadable/Annotations/Logic/vtkSlicerAnnotationModuleLogic.h index a4abe3d7d3e..acae5146bca 100644 --- a/Modules/Loadable/Annotations/Logic/vtkSlicerAnnotationModuleLogic.h +++ b/Modules/Loadable/Annotations/Logic/vtkSlicerAnnotationModuleLogic.h @@ -311,7 +311,9 @@ class VTK_SLICER_ANNOTATIONS_MODULE_LOGIC_EXPORT vtkSlicerAnnotationModuleLogic /// a parent to the new hierarchy node. Return true on success, false on failure. bool AddHierarchyNodeForAnnotation(vtkMRMLAnnotationNode* annotationNode=nullptr); - +private: + vtkSlicerAnnotationModuleLogic(const vtkSlicerAnnotationModuleLogic&) = delete; + void operator=(const vtkSlicerAnnotationModuleLogic&) = delete; }; #endif diff --git a/Modules/Loadable/SceneViews/Logic/vtkSlicerSceneViewsModuleLogic.h b/Modules/Loadable/SceneViews/Logic/vtkSlicerSceneViewsModuleLogic.h index 49de8fda5de..dfe6d844b50 100644 --- a/Modules/Loadable/SceneViews/Logic/vtkSlicerSceneViewsModuleLogic.h +++ b/Modules/Loadable/SceneViews/Logic/vtkSlicerSceneViewsModuleLogic.h @@ -105,6 +105,9 @@ class VTK_SLICER_SCENEVIEWS_MODULE_LOGIC_EXPORT vtkSlicerSceneViewsModuleLogic : std::string m_StringHolder; +private: + vtkSlicerSceneViewsModuleLogic(const vtkSlicerSceneViewsModuleLogic&) = delete; + void operator=(const vtkSlicerSceneViewsModuleLogic&) = delete; }; #endif diff --git a/Modules/Scripted/EditorLib/Logic/vtkImageErode.h b/Modules/Scripted/EditorLib/Logic/vtkImageErode.h index 9d58a01b284..3cb8d85c523 100644 --- a/Modules/Scripted/EditorLib/Logic/vtkImageErode.h +++ b/Modules/Scripted/EditorLib/Logic/vtkImageErode.h @@ -43,6 +43,10 @@ class VTK_SLICER_EDITORLIB_MODULE_LOGIC_EXPORT vtkImageErode : public vtkImageNe void ThreadedExecute(vtkImageData *inData, vtkImageData *outData, int extent[6], int id) override; + +private: + vtkImageErode(const vtkImageErode&) = delete; + void operator=(const vtkImageErode&) = delete; }; #endif diff --git a/Modules/Scripted/EditorLib/Logic/vtkPichonFastMarching.h b/Modules/Scripted/EditorLib/Logic/vtkPichonFastMarching.h index a3dd73e6be6..3c901169116 100644 --- a/Modules/Scripted/EditorLib/Logic/vtkPichonFastMarching.h +++ b/Modules/Scripted/EditorLib/Logic/vtkPichonFastMarching.h @@ -216,6 +216,10 @@ class VTK_SLICER_EDITORLIB_MODULE_LOGIC_EXPORT vtkPichonFastMarching /* perform one step of fast marching return the leaf which has just been added to fmsKNOWN */ float step(); + +private: + vtkPichonFastMarching(const vtkPichonFastMarching&) = delete; + void operator=(const vtkPichonFastMarching&) = delete; }; #endif