From 5f4dcfd74a3760067a9ceb5ff59565aadc5f7118 Mon Sep 17 00:00:00 2001 From: tbaudier Date: Wed, 26 Apr 2017 10:08:11 +0200 Subject: [PATCH] Ramove warnings with C++11 Add ITK_OVERRIDE --- common/clitkDicomRTDoseIO.h | 12 ++++++------ common/clitkDicomRTDoseIOFactory.h | 4 ++-- common/clitkEsrfHstImageIO.h | 12 ++++++------ common/clitkEsrfHstImageIOFactory.h | 4 ++-- common/clitkEsrfHstXMLFileReader.h | 8 ++++---- common/clitkGateAsciiImageIO.h | 14 +++++++------- common/clitkGateAsciiImageIOFactory.h | 4 ++-- common/clitkVfImageIO.h | 12 ++++++------ common/clitkVfImageIOFactory.h | 4 ++-- common/clitkVoxImageIO.h | 12 ++++++------ common/clitkVoxImageIOFactory.h | 4 ++-- common/clitkXdrImageIO.h | 12 ++++++------ common/clitkXdrImageIOFactory.h | 4 ++-- common/rtkEdfImageIO.h | 12 ++++++------ common/rtkEdfImageIOFactory.h | 4 ++-- common/rtkHisImageIO.h | 12 ++++++------ common/rtkHisImageIOFactory.h | 4 ++-- common/rtkHndImageIO.h | 12 ++++++------ common/rtkHndImageIOFactory.h | 4 ++-- common/rtkImagXImageIO.h | 12 ++++++------ common/rtkImagXImageIOFactory.h | 4 ++-- common/rtkImagXXMLFileReader.h | 8 ++++---- common/rtkXRadImageIO.h | 12 ++++++------ common/rtkXRadImageIOFactory.h | 4 ++-- itk/RelativePositionPropImageFilter.h | 8 ++++---- ...dRelativePositionConstraintToLabelImageFilter.h | 12 ++++++------ itk/clitkAutoCropFilter.h | 6 +++--- itk/clitkBooleanOperatorLabelImageFilter.h | 10 +++++----- itk/clitkCropLikeImageFilter.h | 8 ++++---- itk/clitkExtractSliceFilter.h | 10 +++++----- itk/clitkPasteImageFilter.h | 2 +- itk/clitkResampleImageWithOptionsFilter.h | 8 ++++---- itk/clitkSetBackgroundImageFilter.h | 2 +- itk/clitkSliceBySliceRelativePositionFilter.h | 10 +++++----- itk/itkBSplineInterpolateImageFunctionWithLUT.h | 6 +++--- itk/itkFlexibleBinaryFunctorImageFilter.h | 6 +++--- 36 files changed, 141 insertions(+), 141 deletions(-) diff --git a/common/clitkDicomRTDoseIO.h b/common/clitkDicomRTDoseIO.h index f233f3a..2f08938 100644 --- a/common/clitkDicomRTDoseIO.h +++ b/common/clitkDicomRTDoseIO.h @@ -59,17 +59,17 @@ public: itkTypeMacro(DicomRTDoseIO, ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); - virtual bool CanReadFile( const char* FileNameToRead ); - virtual void Read(void * buffer); + virtual void ReadImageInformation() ITK_OVERRIDE; + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool keepOfStream); - virtual void WriteImageInformation() { + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* filename); - virtual void Write(const void* buffer); + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: template void dose_copy_raw (float *img_out, T *img_in, int nvox, float scale); diff --git a/common/clitkDicomRTDoseIOFactory.h b/common/clitkDicomRTDoseIOFactory.h index fc22891..9dae60d 100644 --- a/common/clitkDicomRTDoseIOFactory.h +++ b/common/clitkDicomRTDoseIOFactory.h @@ -41,11 +41,11 @@ public: typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "Dicom RT Dose IO factory"; } diff --git a/common/clitkEsrfHstImageIO.h b/common/clitkEsrfHstImageIO.h index 9a732be..716243b 100644 --- a/common/clitkEsrfHstImageIO.h +++ b/common/clitkEsrfHstImageIO.h @@ -45,15 +45,15 @@ public: itkTypeMacro(EsrfHstImageIO, ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); - virtual bool CanReadFile( const char* FileNameToRead ); - virtual void Read(void * buffer); + virtual void ReadImageInformation() ITK_OVERRIDE; + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool keepOfStream); - virtual void WriteImageInformation() { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* filename); - virtual void Write(const void* buffer); + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: std::string m_XmlFileName; diff --git a/common/clitkEsrfHstImageIOFactory.h b/common/clitkEsrfHstImageIOFactory.h index 0f26584..a76b9f9 100644 --- a/common/clitkEsrfHstImageIOFactory.h +++ b/common/clitkEsrfHstImageIOFactory.h @@ -39,11 +39,11 @@ public: typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "Esrf Hst ImageIO Factory, allows the loading of Esrf Hst images into insight"; } diff --git a/common/clitkEsrfHstXMLFileReader.h b/common/clitkEsrfHstXMLFileReader.h index 1b24a0b..440cc04 100644 --- a/common/clitkEsrfHstXMLFileReader.h +++ b/common/clitkEsrfHstXMLFileReader.h @@ -51,17 +51,17 @@ public: itkNewMacro(Self); /** Determine if a file can be read */ - int CanReadFile(const char* name); + int CanReadFile(const char* name) ITK_OVERRIDE; protected: EsrfHstXMLFileReader() {m_OutputObject = &m_Dictionary;}; virtual ~EsrfHstXMLFileReader() {}; - virtual void StartElement(const char * name,const char **atts); + virtual void StartElement(const char * name,const char **atts) ITK_OVERRIDE; - virtual void EndElement(const char *name); + virtual void EndElement(const char *name) ITK_OVERRIDE; - void CharacterDataHandler(const char *inData, int inLength); + void CharacterDataHandler(const char *inData, int inLength) ITK_OVERRIDE; private: EsrfHstXMLFileReader(const Self&); //purposely not implemented diff --git a/common/clitkGateAsciiImageIO.h b/common/clitkGateAsciiImageIO.h index 7d134de..98c56ee 100644 --- a/common/clitkGateAsciiImageIO.h +++ b/common/clitkGateAsciiImageIO.h @@ -59,16 +59,16 @@ public: itkTypeMacro(GateAsciiImageIO, ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); - virtual bool CanReadFile( const char* FileNameToRead ); - virtual void Read(void * buffer); + virtual void ReadImageInformation() ITK_OVERRIDE; + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ - virtual void WriteImageInformation(); - virtual bool CanWriteFile(const char* filename); - virtual void Write(const void* buffer); + virtual void WriteImageInformation() ITK_OVERRIDE; + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; + virtual void Write(const void* buffer) ITK_OVERRIDE; - virtual bool SupportsDimension(unsigned long dim); + virtual bool SupportsDimension(unsigned long dim) ITK_OVERRIDE; protected: static bool ReadHeader(FILE* handle, GateAsciiHeader& header); diff --git a/common/clitkGateAsciiImageIOFactory.h b/common/clitkGateAsciiImageIOFactory.h index bae5ac3..90fd97e 100644 --- a/common/clitkGateAsciiImageIOFactory.h +++ b/common/clitkGateAsciiImageIOFactory.h @@ -40,11 +40,11 @@ namespace clitk { typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "GateAscii ImageIO Factory, allows the loading of gate ascii images into insight"; } diff --git a/common/clitkVfImageIO.h b/common/clitkVfImageIO.h index 5bdcf88..fbe6d9c 100644 --- a/common/clitkVfImageIO.h +++ b/common/clitkVfImageIO.h @@ -60,15 +60,15 @@ namespace clitk { itkTypeMacro(VfImageIO, ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); - virtual bool CanReadFile( const char* FileNameToRead ); - virtual void Read(void * buffer); + virtual void ReadImageInformation() ITK_OVERRIDE; + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool keepOfStream); - virtual void WriteImageInformation() { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* filename); - virtual void Write(const void* buffer); + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: bool mustWriteHeader; diff --git a/common/clitkVfImageIOFactory.h b/common/clitkVfImageIOFactory.h index f00b8d2..6d790f0 100644 --- a/common/clitkVfImageIOFactory.h +++ b/common/clitkVfImageIOFactory.h @@ -50,11 +50,11 @@ namespace clitk { typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "Vf ImageIO Factory, allows the loading of Vf images into insight"; } diff --git a/common/clitkVoxImageIO.h b/common/clitkVoxImageIO.h index 1d0aced..6a4f924 100644 --- a/common/clitkVoxImageIO.h +++ b/common/clitkVoxImageIO.h @@ -58,15 +58,15 @@ namespace clitk { itkTypeMacro(VoxImageIO, ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); - virtual bool CanReadFile( const char* FileNameToRead ); - virtual void Read(void * buffer); + virtual void ReadImageInformation() ITK_OVERRIDE; + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool keepOfStream); - virtual void WriteImageInformation() { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* filename); - virtual void Write(const void* buffer); + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: bool mustWriteHeader; diff --git a/common/clitkVoxImageIOFactory.h b/common/clitkVoxImageIOFactory.h index 70e00a8..8ca7ccc 100644 --- a/common/clitkVoxImageIOFactory.h +++ b/common/clitkVoxImageIOFactory.h @@ -49,11 +49,11 @@ namespace clitk { typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "Vox ImageIO Factory, allows the loading of Vox images into insight"; } diff --git a/common/clitkXdrImageIO.h b/common/clitkXdrImageIO.h index 98fa739..e916c9c 100644 --- a/common/clitkXdrImageIO.h +++ b/common/clitkXdrImageIO.h @@ -61,15 +61,15 @@ public: /*-------- This part of the interface deals with reading data. ------ */ virtual int ReadImageInformationWithError(); virtual int ReadWithError(void * buffer); - virtual void ReadImageInformation(); - virtual void Read(void * buffer); - virtual bool CanReadFile( const char* FileNameToRead ); + virtual void ReadImageInformation() ITK_OVERRIDE; + virtual void Read(void * buffer) ITK_OVERRIDE; + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool keepOfStream) {;} - virtual void WriteImageInformation() { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* FileNameToWrite); - virtual void Write(const void* buffer); + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } + virtual bool CanWriteFile(const char* FileNameToWrite) ITK_OVERRIDE; + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: void ITKError(std::string funcName, int msgID); diff --git a/common/clitkXdrImageIOFactory.h b/common/clitkXdrImageIOFactory.h index 8cd00b7..47ca942 100644 --- a/common/clitkXdrImageIOFactory.h +++ b/common/clitkXdrImageIOFactory.h @@ -50,11 +50,11 @@ public: typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "Xdr ImageIO Factory, allows the loading of Xdr images into insight"; } diff --git a/common/rtkEdfImageIO.h b/common/rtkEdfImageIO.h index 83823cb..7600367 100644 --- a/common/rtkEdfImageIO.h +++ b/common/rtkEdfImageIO.h @@ -51,22 +51,22 @@ public: itkTypeMacro(EdfImageIO, ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); + virtual void ReadImageInformation() ITK_OVERRIDE; - virtual bool CanReadFile( const char* FileNameToRead ); + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; - virtual void Read(void * buffer); + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool keepOfStream); - virtual void WriteImageInformation() { + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* filename); + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; - virtual void Write(const void* buffer); + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: std::string m_BinaryFileName; diff --git a/common/rtkEdfImageIOFactory.h b/common/rtkEdfImageIOFactory.h index 33eb518..f789f48 100644 --- a/common/rtkEdfImageIOFactory.h +++ b/common/rtkEdfImageIOFactory.h @@ -41,11 +41,11 @@ public: typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "Edf ImageIO Factory, allows the loading of Edf images into insight"; } diff --git a/common/rtkHisImageIO.h b/common/rtkHisImageIO.h index 030711c..f8fa054 100644 --- a/common/rtkHisImageIO.h +++ b/common/rtkHisImageIO.h @@ -54,24 +54,24 @@ public: itkTypeMacro(HisImageIO, itk::ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); + virtual void ReadImageInformation() ITK_OVERRIDE; - virtual bool CanReadFile( const char* FileNameToRead ); + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; - virtual void Read(void * buffer); + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool /*keepOfStream*/) { ; } - virtual void WriteImageInformation() { + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* filename); + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; - virtual void Write(const void* buffer); + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: int m_HeaderSize; diff --git a/common/rtkHisImageIOFactory.h b/common/rtkHisImageIOFactory.h index fbaccda..bb45d20 100644 --- a/common/rtkHisImageIOFactory.h +++ b/common/rtkHisImageIOFactory.h @@ -44,11 +44,11 @@ public: typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "His ImageIO Factory, allows the loading of His images into insight"; } diff --git a/common/rtkHndImageIO.h b/common/rtkHndImageIO.h index 6f32ec9..86678ac 100644 --- a/common/rtkHndImageIO.h +++ b/common/rtkHndImageIO.h @@ -121,20 +121,20 @@ public: itkTypeMacro(HndImageIO, itk::ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); + virtual void ReadImageInformation() ITK_OVERRIDE; - virtual bool CanReadFile( const char* FileNameToRead ); + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; - virtual void Read(void * buffer); + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool /*keepOfStream*/) { } - virtual void WriteImageInformation() { WriteImageInformation(false); } + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* filename); + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; - virtual void Write(const void* buffer); + virtual void Write(const void* buffer) ITK_OVERRIDE; }; // end class HndImageIO diff --git a/common/rtkHndImageIOFactory.h b/common/rtkHndImageIOFactory.h index a410e62..24ca3a1 100644 --- a/common/rtkHndImageIOFactory.h +++ b/common/rtkHndImageIOFactory.h @@ -47,11 +47,11 @@ public: typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "His ImageIO Factory, allows the loading of His images into insight"; } diff --git a/common/rtkImagXImageIO.h b/common/rtkImagXImageIO.h index bbdc6a8..1bb893e 100644 --- a/common/rtkImagXImageIO.h +++ b/common/rtkImagXImageIO.h @@ -48,19 +48,19 @@ public: itkTypeMacro(ImagXImageIO, ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); + virtual void ReadImageInformation() ITK_OVERRIDE; - virtual bool CanReadFile( const char* FileNameToRead ); + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; - virtual void Read(void * buffer); + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool keepOfStream); - virtual void WriteImageInformation() { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* filename); + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; - virtual void Write(const void* buffer); + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: std::string m_RawFileName; diff --git a/common/rtkImagXImageIOFactory.h b/common/rtkImagXImageIOFactory.h index 2466e9d..da584f7 100644 --- a/common/rtkImagXImageIOFactory.h +++ b/common/rtkImagXImageIOFactory.h @@ -42,11 +42,11 @@ public: typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "ImagX ImageIO Factory, allows the loading of ImagX images into insight"; } diff --git a/common/rtkImagXXMLFileReader.h b/common/rtkImagXXMLFileReader.h index 1a948e2..8e30aaa 100644 --- a/common/rtkImagXXMLFileReader.h +++ b/common/rtkImagXXMLFileReader.h @@ -51,17 +51,17 @@ public: itkNewMacro(Self); /** Determine if a file can be read */ - int CanReadFile(const char* name); + int CanReadFile(const char* name) ITK_OVERRIDE; protected: ImagXXMLFileReader() {m_OutputObject = &m_Dictionary;} virtual ~ImagXXMLFileReader() {} - virtual void StartElement(const char * name,const char **atts); + virtual void StartElement(const char * name,const char **atts) ITK_OVERRIDE; - virtual void EndElement(const char *name); + virtual void EndElement(const char *name) ITK_OVERRIDE; - void CharacterDataHandler(const char *inData, int inLength); + void CharacterDataHandler(const char *inData, int inLength) ITK_OVERRIDE; private: ImagXXMLFileReader(const Self&); //purposely not implemented diff --git a/common/rtkXRadImageIO.h b/common/rtkXRadImageIO.h index 8229455..b08fcb5 100644 --- a/common/rtkXRadImageIO.h +++ b/common/rtkXRadImageIO.h @@ -51,22 +51,22 @@ public: itkTypeMacro(XRadImageIO, ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); + virtual void ReadImageInformation() ITK_OVERRIDE; - virtual bool CanReadFile( const char* FileNameToRead ); + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; - virtual void Read(void * buffer); + virtual void Read(void * buffer) ITK_OVERRIDE; /*-------- This part of the interfaces deals with writing data. ----- */ virtual void WriteImageInformation(bool keepOfStream); - virtual void WriteImageInformation() { + virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); } - virtual bool CanWriteFile(const char* filename); + virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE; - virtual void Write(const void* buffer); + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: diff --git a/common/rtkXRadImageIOFactory.h b/common/rtkXRadImageIOFactory.h index 1651918..23cb63e 100644 --- a/common/rtkXRadImageIOFactory.h +++ b/common/rtkXRadImageIOFactory.h @@ -41,11 +41,11 @@ public: typedef itk::SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - const char* GetITKSourceVersion(void) const { + const char* GetITKSourceVersion(void) const ITK_OVERRIDE { return ITK_SOURCE_VERSION; } - const char* GetDescription(void) const { + const char* GetDescription(void) const ITK_OVERRIDE { return "XRad ImageIO Factory, allows the loading of XRad images into insight"; } diff --git a/itk/RelativePositionPropImageFilter.h b/itk/RelativePositionPropImageFilter.h index 183f260..f088c74 100644 --- a/itk/RelativePositionPropImageFilter.h +++ b/itk/RelativePositionPropImageFilter.h @@ -170,8 +170,8 @@ namespace itk } - virtual void GenerateInputRequestedRegion() throw(InvalidRequestedRegionError); - void EnlargeOutputRequestedRegion (DataObject * output); + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE throw(InvalidRequestedRegionError); + void EnlargeOutputRequestedRegion (DataObject * output) ITK_OVERRIDE; protected: RelativePositionPropImageFilter() @@ -185,10 +185,10 @@ namespace itk m_VerboseProgress = false; } virtual ~RelativePositionPropImageFilter() {} - void PrintSelf(std::ostream& os, Indent indent) const; + void PrintSelf(std::ostream& os, Indent indent) ITK_OVERRIDE const; //void GenerateThreadedData(const typename TOutputImage::RegionType& outputRegionForThread, int threadId); - void GenerateData(); + void GenerateData() ITK_OVERRIDE; private: RelativePositionPropImageFilter(const Self&); //purposely not implemented diff --git a/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h b/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h index 781775f..62cbf51 100644 --- a/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h +++ b/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h @@ -62,7 +62,7 @@ namespace clitk { /** Run-time type information (and related methods). */ itkTypeMacro(AddRelativePositionConstraintToLabelImageFilter, ImageToImageFilter); - FILTERBASE_INIT; + FILTERBASE_INIT ITK_OVERRIDE; /** Some convenient typedefs. */ typedef typename ImageType::ConstPointer ImageConstPointer; @@ -85,7 +85,7 @@ namespace clitk { } OrientationTypeEnumeration; /** Input : initial image and object */ - void SetInput(const ImageType * image); + void SetInput(const ImageType * image) ITK_OVERRIDE; void SetInputObject(const ImageType * image); // Options @@ -149,7 +149,7 @@ namespace clitk { typename FloatImageType::Pointer GetFuzzyMap() { return m_FuzzyMap; } // I dont want to verify inputs information - virtual void VerifyInputInformation() { } + virtual void VerifyInputInformation() ITK_OVERRIDE { } // For debug void PrintOptions(); @@ -176,9 +176,9 @@ namespace clitk { double m_Radius; double m_K1; - virtual void GenerateOutputInformation(); - virtual void GenerateInputRequestedRegion(); - virtual void GenerateData(); + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; + virtual void GenerateData() ITK_OVERRIDE; typedef itk::PasteImageFilter PasteFilterType; typedef itk::PasteImageFilter PasteFloatFilterType; diff --git a/itk/clitkAutoCropFilter.h b/itk/clitkAutoCropFilter.h index 98ab74f..f24aa05 100644 --- a/itk/clitkAutoCropFilter.h +++ b/itk/clitkAutoCropFilter.h @@ -54,7 +54,7 @@ namespace clitk { typedef long LabelType; /** Connect one of the operands for pixel-wise addition */ - void SetInput( const ImageType * image); + void SetInput( const ImageType * image) ITK_OVERRIDE; // LabelImage information (BG) void SetBackgroundValue(ImagePixelType p); @@ -71,8 +71,8 @@ namespace clitk { AutoCropFilter(); virtual ~AutoCropFilter() {} - virtual void GenerateOutputInformation(); - virtual void GenerateData(); + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateData() ITK_OVERRIDE; ImagePixelType m_BackgroundValue; ImageRegionType m_Region; diff --git a/itk/clitkBooleanOperatorLabelImageFilter.h b/itk/clitkBooleanOperatorLabelImageFilter.h index adb7116..e7d1b73 100644 --- a/itk/clitkBooleanOperatorLabelImageFilter.h +++ b/itk/clitkBooleanOperatorLabelImageFilter.h @@ -99,18 +99,18 @@ namespace clitk { itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension); // I dont want to verify inputs information - virtual void VerifyInputInformation() { } + virtual void VerifyInputInformation() ITK_OVERRIDE { } protected: BooleanOperatorLabelImageFilter(); virtual ~BooleanOperatorLabelImageFilter() {} - virtual void GenerateOutputInformation(); - virtual void GenerateInputRequestedRegion(); - virtual void GenerateData(); + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; + virtual void GenerateData() ITK_OVERRIDE; // Do not release date to keep input in memory and continue ... - virtual void ReleaseInputs() { } + virtual void ReleaseInputs() ITK_OVERRIDE { } Input1ImagePixelType mBackgroundValue1; Input2ImagePixelType mBackgroundValue2; diff --git a/itk/clitkCropLikeImageFilter.h b/itk/clitkCropLikeImageFilter.h index cc7623f..47ae445 100644 --- a/itk/clitkCropLikeImageFilter.h +++ b/itk/clitkCropLikeImageFilter.h @@ -71,15 +71,15 @@ namespace clitk { itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension); // I dont want to verify inputs information - virtual void VerifyInputInformation() { } + virtual void VerifyInputInformation() ITK_OVERRIDE { } protected: CropLikeImageFilter(); virtual ~CropLikeImageFilter() {} - virtual void GenerateOutputInformation(); - virtual void GenerateData(); - virtual void GenerateInputRequestedRegion(); + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateData() ITK_OVERRIDE; + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; PixelType m_BackgroundValue; RegionType m_OutputRegion; diff --git a/itk/clitkExtractSliceFilter.h b/itk/clitkExtractSliceFilter.h index 2cdabcf..aa0539f 100644 --- a/itk/clitkExtractSliceFilter.h +++ b/itk/clitkExtractSliceFilter.h @@ -78,10 +78,10 @@ namespace clitk { /** Run-time type information (and related methods). */ itkTypeMacro(ExtractSliceFilter, ImageToImageFilter); - FILTERBASE_INIT; + FILTERBASE_INIT ITK_OVERRIDE; /** Input : initial image and object */ - void SetInput(const ImageType * image); + void SetInput(const ImageType * image) ITK_OVERRIDE; // Options itkGetConstMacro(Direction, int); @@ -96,9 +96,9 @@ namespace clitk { int m_Direction; - virtual void GenerateOutputInformation(); - virtual void GenerateInputRequestedRegion(); - virtual void GenerateData(); + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; + virtual void GenerateData() ITK_OVERRIDE; int m_NumberOfSlices; ImagePointer input; diff --git a/itk/clitkPasteImageFilter.h b/itk/clitkPasteImageFilter.h index 72550cf..5f286b3 100644 --- a/itk/clitkPasteImageFilter.h +++ b/itk/clitkPasteImageFilter.h @@ -18,7 +18,7 @@ namespace clitk public itk::PasteImageFilter< TInputImage, TSourceImage, TOutputImage > { public: - virtual void VerifyInputInformation() { } + virtual void VerifyInputInformation() ITK_OVERRIDE { } /** Standard class typedefs. */ typedef PasteImageFilter Self; diff --git a/itk/clitkResampleImageWithOptionsFilter.h b/itk/clitkResampleImageWithOptionsFilter.h index 4b6b409..972075a 100644 --- a/itk/clitkResampleImageWithOptionsFilter.h +++ b/itk/clitkResampleImageWithOptionsFilter.h @@ -84,7 +84,7 @@ namespace clitk { (itk::Concept::SameDimension)); /** Input : image to resample */ - void SetInput(const InputImageType * image); + void SetInput(const InputImageType * image) ITK_OVERRIDE; /** ImageDimension constants */ itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension); @@ -139,9 +139,9 @@ namespace clitk { bool m_VerboseOptions; OutputImageRegionType m_OutputRegion; - virtual void GenerateInputRequestedRegion(); - virtual void GenerateOutputInformation(); - virtual void GenerateData(); + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateData() ITK_OVERRIDE; private: ResampleImageWithOptionsFilter(const Self&); //purposely not implemented diff --git a/itk/clitkSetBackgroundImageFilter.h b/itk/clitkSetBackgroundImageFilter.h index e5ac118..739eb0e 100644 --- a/itk/clitkSetBackgroundImageFilter.h +++ b/itk/clitkSetBackgroundImageFilter.h @@ -211,7 +211,7 @@ protected: SetBackgroundImageFilter() {} virtual ~SetBackgroundImageFilter() {} - void PrintSelf(std::ostream &os, itk::Indent indent) const + void PrintSelf(std::ostream &os, itk::Indent indent) ITK_OVERRIDE const { Superclass::PrintSelf(os, indent); os << indent << "OutsideValue: " << this->GetOutsideValue() << std::endl; diff --git a/itk/clitkSliceBySliceRelativePositionFilter.h b/itk/clitkSliceBySliceRelativePositionFilter.h index ec1246f..de4055b 100644 --- a/itk/clitkSliceBySliceRelativePositionFilter.h +++ b/itk/clitkSliceBySliceRelativePositionFilter.h @@ -48,7 +48,7 @@ namespace clitk { /** Run-time type information (and related methods). */ itkTypeMacro(SliceBySliceRelativePositionFilter, ImageToImageFilter); - FILTERBASE_INIT; + FILTERBASE_INIT ITK_OVERRIDE; /** ImageDimension constants */ itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension); @@ -67,7 +67,7 @@ namespace clitk { typedef typename RelPosFilterType::OrientationTypeEnumeration OrientationTypeEnumeration; /** Input : initial image and object */ - void SetInput(const ImageType * image); + void SetInput(const ImageType * image) ITK_OVERRIDE; void SetInputObject(const ImageType * image); // Options @@ -106,9 +106,9 @@ namespace clitk { SliceBySliceRelativePositionFilter(); virtual ~SliceBySliceRelativePositionFilter() {} - virtual void GenerateOutputInformation(); - virtual void GenerateInputRequestedRegion(); - virtual void GenerateData(); + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; + virtual void GenerateData() ITK_OVERRIDE; ImagePointer input; ImagePointer object; diff --git a/itk/itkBSplineInterpolateImageFunctionWithLUT.h b/itk/itkBSplineInterpolateImageFunctionWithLUT.h index 7fd7ab8..cb3a91e 100644 --- a/itk/itkBSplineInterpolateImageFunctionWithLUT.h +++ b/itk/itkBSplineInterpolateImageFunctionWithLUT.h @@ -59,19 +59,19 @@ namespace itk { void SetSplineOrders(const SizeType & SplineOrders); /** Set the input image. This must be set by the user. */ - virtual void SetInputImage(const TImageType * inputData); + virtual void SetInputImage(const TImageType * inputData) ITK_OVERRIDE; /** Evaluate the function at a ContinuousIndex position. Overwritten for taking LUT into account (RP: multi-threading-compatible version, the threadID is actually ignored) */ - virtual OutputType EvaluateAtContinuousIndex(const ContinuousIndexType & index, unsigned int /* threadID */ ) const + virtual OutputType EvaluateAtContinuousIndex(const ContinuousIndexType & index, unsigned int /* threadID */ ) ITK_OVERRIDE const { return this->EvaluateAtContinuousIndex( index ); } /** Evaluate the function at a ContinuousIndex position. Overwritten for taking LUT into account */ - virtual OutputType EvaluateAtContinuousIndex(const ContinuousIndexType & index ) const; + virtual OutputType EvaluateAtContinuousIndex(const ContinuousIndexType & index ) ITK_OVERRIDE const; /** Static convenient functions to compute BSpline weights for various order, dimension, sampling ... **/ diff --git a/itk/itkFlexibleBinaryFunctorImageFilter.h b/itk/itkFlexibleBinaryFunctorImageFilter.h index 6b85a09..dbf405b 100644 --- a/itk/itkFlexibleBinaryFunctorImageFilter.h +++ b/itk/itkFlexibleBinaryFunctorImageFilter.h @@ -109,8 +109,8 @@ public: } } - virtual void GenerateOutputInformation(); - virtual void GenerateInputRequestedRegion(); + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; /** ImageDimension constants */ itkStaticConstMacro( @@ -146,7 +146,7 @@ protected: * \sa ImageToImageFilter::ThreadedGenerateData(), * ImageToImageFilter::GenerateData() */ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, - itk::ThreadIdType threadId ); + itk::ThreadIdType threadId ) ITK_OVERRIDE; private: FlexibleBinaryFunctorImageFilter(const Self&); //purposely not implemented -- 2.47.1