Merge branch 'cpp14_override' into 'develop'

C++14: Replace ITK_OVERRIDE by override

See merge request !131

Examples/Application/ApplicationExample.cxx

@@ -97,7 +97,7 @@ private:
   //  \code{DoInit()} method contains class information and description, parameter set up, and example values.
   //  Software Guide : EndLatex
 
-  void DoInit() ITK_OVERRIDE
+  void DoInit() override
   {
 
     // Software Guide : BeginLatex

Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx

@@ -141,7 +141,7 @@ public:
 
 protected:
   MyChangeDetectorImageFilter() {}
-  ~MyChangeDetectorImageFilter() ITK_OVERRIDE {}
+  ~MyChangeDetectorImageFilter() override {}
 
 private:
   MyChangeDetectorImageFilter(const Self &); //purposely not implemented

Examples/Filtering/CompositeFilterExample.cxx

@@ -96,7 +96,7 @@ public:
   itkTypeMacro(CompositeExampleImageFilter, itk::ImageToImageFilter);
 
   /** Display */
-  void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+  void PrintSelf(std::ostream& os, itk::Indent indent) const override;
 
 //  Software Guide : BeginLatex
 //
@@ -135,7 +135,7 @@ protected:
   RescalerType;
 //  Software Guide : EndCodeSnippet
 
-  void GenerateData() ITK_OVERRIDE;
+  void GenerateData() override;
 
 private:
 

Examples/Filtering/GeometriesChangeSpatialReference.cxx

@@ -102,11 +102,11 @@ protected:
   /** Default constructor. */
   MyReprojectionFilter(){ }
   /** Destructor. */
-  ~MyReprojectionFilter() ITK_OVERRIDE{ }
+  ~MyReprojectionFilter() override{ }
 
 private:
 
-  OGRSpatialReference*     DoDefineNewLayerSpatialReference(otb::ogr::Layer const& itkNotUsed(source)) const ITK_OVERRIDE
+  OGRSpatialReference*     DoDefineNewLayerSpatialReference(otb::ogr::Layer const& itkNotUsed(source)) const override
     {
     return m_osr.get();
     }

Examples/Registration/ImageRegistration1.cxx

@@ -81,12 +81,12 @@ public:
   typedef itk::RegularStepGradientDescentOptimizer OptimizerType;
   typedef const OptimizerType *                    OptimizerPointer;
 
-  void Execute(itk::Object *caller, const itk::EventObject& event) ITK_OVERRIDE
+  void Execute(itk::Object *caller, const itk::EventObject& event) override
   {
     Execute((const itk::Object *) caller, event);
   }
 
-  void Execute(const itk::Object * object, const itk::EventObject& event) ITK_OVERRIDE
+  void Execute(const itk::Object * object, const itk::EventObject& event) override
   {
     OptimizerPointer optimizer =
       dynamic_cast<OptimizerPointer>(object);

Examples/Registration/ImageRegistration2.cxx

@@ -100,12 +100,12 @@ public:
   typedef   itk::GradientDescentOptimizer OptimizerType;
   typedef   const OptimizerType *         OptimizerPointer;
 
-  void Execute(itk::Object *caller, const itk::EventObject& event) ITK_OVERRIDE
+  void Execute(itk::Object *caller, const itk::EventObject& event) override
   {
     Execute((const itk::Object *) caller, event);
   }
 
-  void Execute(const itk::Object * object, const itk::EventObject& event) ITK_OVERRIDE
+  void Execute(const itk::Object * object, const itk::EventObject& event) override
   {
     OptimizerPointer optimizer =
       dynamic_cast<OptimizerPointer>(object);

Examples/Registration/ImageRegistration5.cxx

@@ -95,12 +95,12 @@ public:
   typedef itk::RegularStepGradientDescentOptimizer OptimizerType;
   typedef   const OptimizerType *                  OptimizerPointer;
 
-  void Execute(itk::Object *caller, const itk::EventObject& event) ITK_OVERRIDE
+  void Execute(itk::Object *caller, const itk::EventObject& event) override
   {
     Execute((const itk::Object *) caller, event);
   }
 
-  void Execute(const itk::Object * object, const itk::EventObject& event) ITK_OVERRIDE
+  void Execute(const itk::Object * object, const itk::EventObject& event) override
   {
     OptimizerPointer optimizer =
       dynamic_cast<OptimizerPointer>(object);

Examples/Registration/ImageRegistration9.cxx

@@ -90,12 +90,12 @@ public:
   typedef itk::RegularStepGradientDescentOptimizer OptimizerType;
   typedef   const OptimizerType *                  OptimizerPointer;
 
-  void Execute(itk::Object *caller, const itk::EventObject& event) ITK_OVERRIDE
+  void Execute(itk::Object *caller, const itk::EventObject& event) override
   {
     Execute((const itk::Object *) caller, event);
   }
 
-  void Execute(const itk::Object * object, const itk::EventObject& event) ITK_OVERRIDE
+  void Execute(const itk::Object * object, const itk::EventObject& event) override
   {
     OptimizerPointer optimizer =
       dynamic_cast<OptimizerPointer>(object);

Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx

@@ -135,10 +135,10 @@ protected:
     {
     m_Image = nullptr;
     }
-  ~ImageUniqueValuesCalculator() ITK_OVERRIDE
+  ~ImageUniqueValuesCalculator() override
   {
   }
-  void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+  void PrintSelf(std::ostream& os, itk::Indent indent) const override
   {
     Superclass::PrintSelf(os, indent);
     os << indent << "Image: " << m_Image.GetPointer() << std::endl;
@@ -452,9 +452,9 @@ public:
 
 protected:
   TernaryFunctorImageFilterWithNBands() {}
-  ~TernaryFunctorImageFilterWithNBands() ITK_OVERRIDE {}
+  ~TernaryFunctorImageFilterWithNBands() override {}
 
-  void GenerateOutputInformation() ITK_OVERRIDE
+  void GenerateOutputInformation() override
   {
     Superclass::GenerateOutputInformation();
     this->GetOutput()->SetNumberOfComponentsPerPixel( m_NumberOfOutputBands );

Modules/Core/Common/include/otbLogger.h

@@ -70,7 +70,7 @@ public:
 
 protected:
   Logger();
-  virtual ~Logger() ITK_OVERRIDE;
+  virtual ~Logger() override;
 
 private:
   Logger(const Self &); //purposely not implemented

Modules/Learning/Sampling/include/otbSampleAugmentationFilter.h

@@ -123,15 +123,15 @@ public:
 
 protected:
   SampleAugmentationFilter();
-  ~SampleAugmentationFilter() ITK_OVERRIDE {}
+  ~SampleAugmentationFilter() override {}
 
   /** Generate Data method*/
-  void GenerateData() ITK_OVERRIDE;
+  void GenerateData() override;
 
   /** DataObject pointer */
   typedef itk::DataObject::Pointer DataObjectPointer;
 
-  DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+  DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
   using Superclass::MakeOutput;
 
 

Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetBoolParameter.h

@@ -41,7 +41,7 @@ class OTBQtWidget_EXPORT QtWidgetBoolParameter : public QtWidgetParameterBase
 
 public:
   QtWidgetBoolParameter(BoolParameter*, QtWidgetModel*);
-  ~QtWidgetBoolParameter() ITK_OVERRIDE;
+  ~QtWidgetBoolParameter() override;
 
 public slots:
   void SetValue( bool value );
@@ -50,9 +50,9 @@ private:
   QtWidgetBoolParameter(const QtWidgetBoolParameter&) = delete;
   void operator=(const QtWidgetBoolParameter&) = delete;
 
-  void DoCreateWidget() ITK_OVERRIDE;
+  void DoCreateWidget() override;
 
-  void DoUpdateGUI() ITK_OVERRIDE;
+  void DoUpdateGUI() override;
 
   QToolButton *m_Button;
 };