Commit 9bdec1f7 authored by Victor Poughon's avatar Victor Poughon

Merge branch 'cpp14_override' into 'develop'

C++14: Replace ITK_OVERRIDE by override

See merge request !131
parents 49be930a 957c19d8
...@@ -97,7 +97,7 @@ private: ...@@ -97,7 +97,7 @@ private:
// \code{DoInit()} method contains class information and description, parameter set up, and example values. // \code{DoInit()} method contains class information and description, parameter set up, and example values.
// Software Guide : EndLatex // Software Guide : EndLatex
void DoInit() ITK_OVERRIDE void DoInit() override
{ {
// Software Guide : BeginLatex // Software Guide : BeginLatex
......
...@@ -141,7 +141,7 @@ public: ...@@ -141,7 +141,7 @@ public:
protected: protected:
MyChangeDetectorImageFilter() {} MyChangeDetectorImageFilter() {}
~MyChangeDetectorImageFilter() ITK_OVERRIDE {} ~MyChangeDetectorImageFilter() override {}
private: private:
MyChangeDetectorImageFilter(const Self &); //purposely not implemented MyChangeDetectorImageFilter(const Self &); //purposely not implemented
......
...@@ -96,7 +96,7 @@ public: ...@@ -96,7 +96,7 @@ public:
itkTypeMacro(CompositeExampleImageFilter, itk::ImageToImageFilter); itkTypeMacro(CompositeExampleImageFilter, itk::ImageToImageFilter);
/** Display */ /** 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 // Software Guide : BeginLatex
// //
...@@ -135,7 +135,7 @@ protected: ...@@ -135,7 +135,7 @@ protected:
RescalerType; RescalerType;
// Software Guide : EndCodeSnippet // Software Guide : EndCodeSnippet
void GenerateData() ITK_OVERRIDE; void GenerateData() override;
private: private:
......
...@@ -102,11 +102,11 @@ protected: ...@@ -102,11 +102,11 @@ protected:
/** Default constructor. */ /** Default constructor. */
MyReprojectionFilter(){ } MyReprojectionFilter(){ }
/** Destructor. */ /** Destructor. */
~MyReprojectionFilter() ITK_OVERRIDE{ } ~MyReprojectionFilter() override{ }
private: 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(); return m_osr.get();
} }
......
...@@ -81,12 +81,12 @@ public: ...@@ -81,12 +81,12 @@ public:
typedef itk::RegularStepGradientDescentOptimizer OptimizerType; typedef itk::RegularStepGradientDescentOptimizer OptimizerType;
typedef const OptimizerType * OptimizerPointer; 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); 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 = OptimizerPointer optimizer =
dynamic_cast<OptimizerPointer>(object); dynamic_cast<OptimizerPointer>(object);
......
...@@ -100,12 +100,12 @@ public: ...@@ -100,12 +100,12 @@ public:
typedef itk::GradientDescentOptimizer OptimizerType; typedef itk::GradientDescentOptimizer OptimizerType;
typedef const OptimizerType * OptimizerPointer; 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); 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 = OptimizerPointer optimizer =
dynamic_cast<OptimizerPointer>(object); dynamic_cast<OptimizerPointer>(object);
......
...@@ -95,12 +95,12 @@ public: ...@@ -95,12 +95,12 @@ public:
typedef itk::RegularStepGradientDescentOptimizer OptimizerType; typedef itk::RegularStepGradientDescentOptimizer OptimizerType;
typedef const OptimizerType * OptimizerPointer; 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); 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 = OptimizerPointer optimizer =
dynamic_cast<OptimizerPointer>(object); dynamic_cast<OptimizerPointer>(object);
......
...@@ -90,12 +90,12 @@ public: ...@@ -90,12 +90,12 @@ public:
typedef itk::RegularStepGradientDescentOptimizer OptimizerType; typedef itk::RegularStepGradientDescentOptimizer OptimizerType;
typedef const OptimizerType * OptimizerPointer; 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); 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 = OptimizerPointer optimizer =
dynamic_cast<OptimizerPointer>(object); dynamic_cast<OptimizerPointer>(object);
......
...@@ -135,10 +135,10 @@ protected: ...@@ -135,10 +135,10 @@ protected:
{ {
m_Image = nullptr; 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); Superclass::PrintSelf(os, indent);
os << indent << "Image: " << m_Image.GetPointer() << std::endl; os << indent << "Image: " << m_Image.GetPointer() << std::endl;
...@@ -452,9 +452,9 @@ public: ...@@ -452,9 +452,9 @@ public:
protected: protected:
TernaryFunctorImageFilterWithNBands() {} TernaryFunctorImageFilterWithNBands() {}
~TernaryFunctorImageFilterWithNBands() ITK_OVERRIDE {} ~TernaryFunctorImageFilterWithNBands() override {}
void GenerateOutputInformation() ITK_OVERRIDE void GenerateOutputInformation() override
{ {
Superclass::GenerateOutputInformation(); Superclass::GenerateOutputInformation();
this->GetOutput()->SetNumberOfComponentsPerPixel( m_NumberOfOutputBands ); this->GetOutput()->SetNumberOfComponentsPerPixel( m_NumberOfOutputBands );
......
...@@ -70,7 +70,7 @@ public: ...@@ -70,7 +70,7 @@ public:
protected: protected:
Logger(); Logger();
virtual ~Logger() ITK_OVERRIDE; virtual ~Logger() override;
private: private:
Logger(const Self &); //purposely not implemented Logger(const Self &); //purposely not implemented
......
...@@ -123,15 +123,15 @@ public: ...@@ -123,15 +123,15 @@ public:
protected: protected:
SampleAugmentationFilter(); SampleAugmentationFilter();
~SampleAugmentationFilter() ITK_OVERRIDE {} ~SampleAugmentationFilter() override {}
/** Generate Data method*/ /** Generate Data method*/
void GenerateData() ITK_OVERRIDE; void GenerateData() override;
/** DataObject pointer */ /** DataObject pointer */
typedef itk::DataObject::Pointer DataObjectPointer; typedef itk::DataObject::Pointer DataObjectPointer;
DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE; DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput; using Superclass::MakeOutput;
......
...@@ -41,7 +41,7 @@ class OTBQtWidget_EXPORT QtWidgetBoolParameter : public QtWidgetParameterBase ...@@ -41,7 +41,7 @@ class OTBQtWidget_EXPORT QtWidgetBoolParameter : public QtWidgetParameterBase
public: public:
QtWidgetBoolParameter(BoolParameter*, QtWidgetModel*); QtWidgetBoolParameter(BoolParameter*, QtWidgetModel*);
~QtWidgetBoolParameter() ITK_OVERRIDE; ~QtWidgetBoolParameter() override;
public slots: public slots:
void SetValue( bool value ); void SetValue( bool value );
...@@ -50,9 +50,9 @@ private: ...@@ -50,9 +50,9 @@ private:
QtWidgetBoolParameter(const QtWidgetBoolParameter&) = delete; QtWidgetBoolParameter(const QtWidgetBoolParameter&) = delete;
void operator=(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; QToolButton *m_Button;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment