Ramove warnings with C++11

Add ITK_OVERRIDE

diff --git a/common/clitkDicomRTDoseIO.h b/common/clitkDicomRTDoseIO.h
index f233f3a4619cf5f8c4f25d2cd48c43d7cf2914c3..2f08938c11824ac45c3517d95237b75b1c234e54 100644 (file)
--- 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 <class T> 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 fc22891fc2a22e7888b26b1995b51606ca10599e..9dae60d77d34db2dedd905515c6817d80c14622c 100644 (file)
--- a/common/clitkDicomRTDoseIOFactory.h
+++ b/common/clitkDicomRTDoseIOFactory.h
@@ -41,11 +41,11 @@ public:
   typedef itk::SmartPointer<const Self>  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 9a732befc38bc8ba37be06ab5490474ce3ac42b7..716243b794da03ef080e04fabe88efb6846b878c 100644 (file)
--- 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 0f26584258f7dd6657acb97ce07657873237b2d4..a76b9f9dad4884cef3c70290c942f3ddb6bf86d7 100644 (file)
--- a/common/clitkEsrfHstImageIOFactory.h
+++ b/common/clitkEsrfHstImageIOFactory.h
@@ -39,11 +39,11 @@ public:
   typedef itk::SmartPointer<const Self>  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 1b24a0b59f7524706dd608276ea8b253f925af48..440cc042d9b5938413f8b7ce8f59926830bb6331 100644 (file)
--- 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 7d134de7030ac61afdea880fde62abb2d74dd92a..98c56ee7bddab0521f453454bae4d96ef9811840 100644 (file)
--- 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 bae5ac3eceb60723d63d34b50f8df974b1b885af..90fd97e1118572a9cb65094eb174058645303299 100644 (file)
--- a/common/clitkGateAsciiImageIOFactory.h
+++ b/common/clitkGateAsciiImageIOFactory.h
@@ -40,11 +40,11 @@ namespace clitk {
            typedef itk::SmartPointer<const Self>  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 5bdcf887d08891436ac771c119d795e80a71a122..fbe6d9cd6efc9c63f01313b2d76dabffa0422e61 100644 (file)
--- 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 f00b8d20e3884e877b5fa42bfc505e6d74ba230a..6d790f0ef659641ef35a58182eb5fc090dedc948 100644 (file)
--- a/common/clitkVfImageIOFactory.h
+++ b/common/clitkVfImageIOFactory.h
@@ -50,11 +50,11 @@ namespace clitk {
        typedef itk::SmartPointer<const Self>  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 1d0aced244ee4f5be7bb203ab935f07758e5f8a2..6a4f9246d68a69be9808703225e25dcce2acba7e 100644 (file)
--- 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 70e00a8fef585b6cfee495ae2c88cf46ebbf565c..8ca7ccc913c0a845721a81a76caaba1b23ba1a93 100644 (file)
--- a/common/clitkVoxImageIOFactory.h
+++ b/common/clitkVoxImageIOFactory.h
@@ -49,11 +49,11 @@ namespace clitk {
        typedef itk::SmartPointer<const Self>  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 98fa7393ac8db3c9ee61c65b7508ae2e0b26b995..e916c9cb96f99a05bad8bf83e86c895f6f3400ea 100644 (file)
--- 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 8cd00b7c020243d7c107968c448ada527d9fd9d6..47ca942633ddda32afa037395233479357a3f46e 100644 (file)
--- a/common/clitkXdrImageIOFactory.h
+++ b/common/clitkXdrImageIOFactory.h
@@ -50,11 +50,11 @@ public:
     typedef itk::SmartPointer<const Self>  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 83823cb427030353c13479815a8eb1935aed640f..7600367aaebc729dfd11076b32709d318aab6ec3 100644 (file)
--- 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 33eb518f6501d15af90bc382dacc6b4080575571..f789f48db3dffc2bf3ee60cb0ba8cbeeae81c883 100644 (file)
--- a/common/rtkEdfImageIOFactory.h
+++ b/common/rtkEdfImageIOFactory.h
@@ -41,11 +41,11 @@ public:
   typedef itk::SmartPointer<const Self> 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 030711cf924753b169c54ee91cd90a1d10409b74..f8fa0544e011acbf6a875b31387b4b90621a1b4d 100644 (file)
--- 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 fbaccda13a5c3cb75ba8b9bf6676f6ddfe9ad477..bb45d20eb2e792c62eb79659a1ce0aa714d26ac1 100644 (file)
--- a/common/rtkHisImageIOFactory.h
+++ b/common/rtkHisImageIOFactory.h
@@ -44,11 +44,11 @@ public:
   typedef itk::SmartPointer<const Self> 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 6f32ec94a593d57920e8172048c4efa53cc17a2d..86678ac790015f4b37fe2e4bcedc0d9b1fafbaeb 100644 (file)
--- 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 a410e62787e70f455b1ea51216ab099a40f58aaa..24ca3a1bc1780c0e76ebcf9ebef39f3a498f6a03 100644 (file)
--- a/common/rtkHndImageIOFactory.h
+++ b/common/rtkHndImageIOFactory.h
@@ -47,11 +47,11 @@ public:
   typedef itk::SmartPointer<const Self> 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 bbdc6a855ca6ca0f7b88bab08d505ec00449322d..1bb893e5aa3dba23629cdcf1bbe433c7378d0bea 100644 (file)
--- 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 2466e9d9607bbf7bd18ebb19840341115edcc925..da584f73c53466c44249e591982b3cf12f0a7d0d 100644 (file)
--- a/common/rtkImagXImageIOFactory.h
+++ b/common/rtkImagXImageIOFactory.h
@@ -42,11 +42,11 @@ public:
   typedef itk::SmartPointer<const Self> 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 1a948e2edcd29ddcab54c3db7cc258d104eaf362..8e30aaad5e653652f011d118dd29622ee206c129 100644 (file)
--- 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 822945503be8e82cf62d177cc1e97d7857d1137d..b08fcb5be7eb4794f8f800e5c0e905c7aa14ffac 100644 (file)
--- 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 1651918a33b15ab7072ea5d0a7330d35911c4cfe..23cb63e14e0573bf7e1be78e7b68bce22a93a56e 100644 (file)
--- a/common/rtkXRadImageIOFactory.h
+++ b/common/rtkXRadImageIOFactory.h
@@ -41,11 +41,11 @@ public:
   typedef itk::SmartPointer<const Self> 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 183f260e0bee422f9a632a668f42fc6c91317274..f088c74249b2d2cd438110d5755f020bc8265a9b 100644 (file)
--- 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 781775f0cc9541c488ca0ddfa4b8566b8ddc9779..62cbf5109d15e459cee669ff0f8c7255e9a9503b 100644 (file)
--- 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<ImageType,ImageType> PasteFilterType;
     typedef itk::PasteImageFilter<FloatImageType,FloatImageType> PasteFloatFilterType;

diff --git a/itk/clitkAutoCropFilter.h b/itk/clitkAutoCropFilter.h
index 98ab74f8fa7b3ab9a7817da518478b83a40abd5c..f24aa05c09e506a34b9bc970e4705b8298727ad1 100644 (file)
--- 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 adb7116ea10b2c9aecc332f557ec98c486f921d2..e7d1b73113fb99918b1dd001308373f76a880b87 100644 (file)
--- 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 cc7623f5741a49a2d4e0efc735e95ecd8a9311a5..47ae445a2b2312c53b6e8521b684110f0449e205 100644 (file)
--- 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 2cdabcf4d4bbec191c9b0929330ed8d9ae1ff47e..aa0539f2e010260d3aa944296d19fbc8f67d8705 100644 (file)
--- 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 72550cfdfe3b7ac9b31c6525aa4f863d0cddd91e..5f286b3dd30e0d0a5de23d3fe3af1db4f967d83a 100644 (file)
--- 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 4b6b409d37caaa492ef14769dc4f45b127898323..972075a78e6084b8b3e07823488344701e7662c2 100644 (file)
--- a/itk/clitkResampleImageWithOptionsFilter.h
+++ b/itk/clitkResampleImageWithOptionsFilter.h
@@ -84,7 +84,7 @@ namespace clitk {
                  (itk::Concept::SameDimension<InputImageDimension, OutputImageDimension>));
 
   /** 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 e5ac118e58c8bf3a1d6de546b1b54a6dae80f241..739eb0ecb1b72074e65749631f1b770e1927df2c 100644 (file)
--- 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 ec1246fed428e9b60e7f12acb336c18f2a839bb3..de4055b732e04c511612e8ebdbb16c1f4660ff0e 100644 (file)
--- 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 7fd7ab81e0686efcb26a4035d487958eaebaed22..cb3a91e3f2cbabb3693de8a46e60a079efa3b7f5 100644 (file)
--- 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 6b85a096a3c0dcdd83dc9cdc9a8f9d4e18785805..dbf405bb1b5f244aa16431138c1e344d61f42ed6 100644 (file)
--- 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