From 0769470e0f6a079ff826c82d96d55e6fa9284494 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@cnes.fr>
Date: Wed, 7 Mar 2018 08:13:33 +0100
Subject: [PATCH] WRG: Fix more missing override warnings
---
.../app/otbMultiImageSamplingRate.cxx | 6 +++---
.../AppClassification/app/otbSampleExtraction.cxx | 6 +++---
.../AppClassification/app/otbSampleSelection.cxx | 6 +++---
.../AppClassification/app/otbTrainVectorClassifier.cxx | 6 +++---
.../app/otbTrainDimensionalityReduction.cxx | 6 +++---
.../AppSARUtils/app/otbComputeModulusAndPhase.cxx | 6 +++---
.../Filtering/Wavelet/include/otbWaveletImageFilter.h | 6 +++---
.../Wavelet/include/otbWaveletInverseImageFilter.h | 8 ++++----
...otbWaveletsBandsListToWaveletsSynopsisImageFilter.h | 8 ++++----
...otbWaveletsSynopsisImageToWaveletsBandsListFilter.h | 10 +++++-----
.../include/otbAutoencoderModel.h | 8 ++++----
.../include/otbImageDimensionalityReductionFilter.h | 2 +-
.../include/otbPCAModel.h | 6 +++---
.../include/otbSOMModel.h | 10 +++++-----
.../otbSharkRandomForestsMachineLearningModel.h | 2 +-
.../otbSharkRandomForestsMachineLearningModelFactory.h | 4 ++--
.../include/otbSharkKMeansMachineLearningModel.h | 2 +-
.../otbSharkKMeansMachineLearningModelFactory.h | 4 ++--
.../Simulation/include/otbProSailParameters.h | 2 +-
Modules/Wrappers/SWIG/src/python/itkPyCommand.h | 4 ++--
20 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx b/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx
index 889e909cc5..cf142f76f6 100644
--- a/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx
+++ b/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx
@@ -57,7 +57,7 @@ private:
m_CalculatorList = RateCalculatorListType::New();
}
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("MultiImageSamplingRate");
SetDescription("Compute sampling rate for an input set of images.");
@@ -186,11 +186,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
// Clear state
m_CalculatorList->Clear();
diff --git a/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx b/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
index a9c2b07fbd..63615e03cc 100644
--- a/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
+++ b/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
@@ -53,7 +53,7 @@ public:
private:
SampleExtraction() {}
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("SampleExtraction");
SetDescription("Extracts samples values from an image.");
@@ -119,7 +119,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
if ( HasValue("vec") )
{
@@ -149,7 +149,7 @@ private:
}
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
ogr::DataSource::Pointer vectors;
ogr::DataSource::Pointer output;
diff --git a/Modules/Applications/AppClassification/app/otbSampleSelection.cxx b/Modules/Applications/AppClassification/app/otbSampleSelection.cxx
index b41f20470f..8faee83496 100644
--- a/Modules/Applications/AppClassification/app/otbSampleSelection.cxx
+++ b/Modules/Applications/AppClassification/app/otbSampleSelection.cxx
@@ -80,7 +80,7 @@ private:
m_RateCalculator = RateCalculatorType::New();
}
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("SampleSelection");
SetDescription("Selects samples from a training vector data set.");
@@ -227,7 +227,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
if ( HasValue("vec") )
{
@@ -257,7 +257,7 @@ private:
}
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
// Clear state
m_RateCalculator->ClearRates();
diff --git a/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
index f37eb3020f..9de1efb8b1 100644
--- a/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
@@ -54,7 +54,7 @@ public:
typedef ContingencyTableType::Pointer ContingencyTablePointerType;
protected:
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName( "TrainVectorClassifier" );
SetDescription( "Train a classifier based on labeled geometries and a "
@@ -73,12 +73,12 @@ protected:
Superclass::DoInit();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
Superclass::DoUpdateParameters();
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
m_FeaturesInfo.SetClassFieldNames( GetChoiceNames( "cfield" ), GetSelectedItems( "cfield" ) );
diff --git a/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx b/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx
index 1cbc567c56..8d52132dec 100644
--- a/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx
+++ b/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx
@@ -68,7 +68,7 @@ public:
typedef otb::DimensionalityReductionModelFactory<ValueType, ValueType> ModelFactoryType;
private:
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("TrainDimensionalityReduction");
SetDescription("Train a dimensionality reduction model");
@@ -115,11 +115,11 @@ private:
" value_5 value_6 value_7 value_8 value_9");
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
std::string shapefile = GetParameterString("io.vd");
diff --git a/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx b/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
index ec91b7e53b..6c949a2b9d 100644
--- a/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
+++ b/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
@@ -57,7 +57,7 @@ public:
typedef itk::ComplexToPhaseImageFilter<ComplexFloatImageType, FloatImageType> PhaseFilterType;
private:
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("ComputeModulusAndPhase");
SetDescription("This application computes the modulus and the phase of a complex SAR image.");
@@ -100,12 +100,12 @@ private:
}
// DoUpdateParameters() is called as soon as a parameter value change.
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
}
// DoExecute() contains the application core.
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
m_Modulus = ModulusFilterType::New();
m_Phase = PhaseFilterType::New();
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
index d1022824dd..1d4f15234a 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
@@ -92,11 +92,11 @@ protected:
WaveletImageFilter();
virtual ~WaveletImageFilter();
- virtual void GenerateInputRequestedRegion();
+ virtual void GenerateInputRequestedRegion() ITK_OVERRIDE;
- virtual void GenerateData();
+ virtual void GenerateData() ITK_OVERRIDE;
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
WaveletImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
index 52030d8444..1b28666526 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
@@ -87,17 +87,17 @@ public:
itkSetMacro(NumberOfDecompositions,unsigned int);
/** If the filter is modified, the internal filters need to be modified too */
- virtual void Modified() const;
+ virtual void Modified() const ITK_OVERRIDE;
protected:
WaveletInverseImageFilter();
virtual ~WaveletInverseImageFilter();
- virtual void GenerateInputRequestedRegion();
+ virtual void GenerateInputRequestedRegion() ITK_OVERRIDE;
- virtual void GenerateData();
+ virtual void GenerateData() ITK_OVERRIDE;
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
WaveletInverseImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
index 2c3225cf24..ea26fe6226 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
@@ -68,19 +68,19 @@ public:
protected:
/** Main computation method */
- virtual void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId);
+ virtual void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
/** GenerateOutputInformation
* Set the number of bands of the output.
* Copy information from the first image of the list if existing.
**/
- virtual void GenerateOutputInformation(void);
+ virtual void GenerateOutputInformation(void) ITK_OVERRIDE;
/**
* GenerateInputRequestedRegion
* Set the requested region of each image in the list.
*/
- virtual void GenerateInputRequestedRegion(void);
+ virtual void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
/** Constructor */
WaveletsBandsListToWaveletsSynopsisImageFilter();
@@ -89,7 +89,7 @@ protected:
virtual ~WaveletsBandsListToWaveletsSynopsisImageFilter();
/**PrintSelf method */
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
WaveletsBandsListToWaveletsSynopsisImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
index 5714fc1cab..a19c09bacb 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
@@ -80,7 +80,7 @@ public:
itkGetMacro(DecimationRatio,unsigned int);
/** If the filter is modified, the extract list need to be regenerated */
- virtual void Modified() const;
+ virtual void Modified() const ITK_OVERRIDE;
protected:
/** Constructor */
@@ -90,16 +90,16 @@ protected:
virtual ~WaveletsSynopsisImageToWaveletsBandsListFilter();
/**PrintSelf method */
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
/** Generate the input requested region from the first element in the list. */
- virtual void GenerateInputRequestedRegion(void);
+ virtual void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
/** Generate the output information by building the output list. */
- virtual void GenerateOutputInformation(void);
+ virtual void GenerateOutputInformation(void) ITK_OVERRIDE;
/** Main computation method */
- virtual void GenerateData(void);
+ virtual void GenerateData(void) ITK_OVERRIDE;
private:
WaveletsSynopsisImageToWaveletsBandsListFilter(const Self&); //purposely not implemented
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
index 14205f0cd8..ee58a9428b 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
@@ -119,8 +119,8 @@ public:
itkGetMacro(LearningCurveFileName,std::string);
itkSetMacro(LearningCurveFileName,std::string);
- bool CanReadFile(const std::string & filename);
- bool CanWriteFile(const std::string & filename);
+ bool CanReadFile(const std::string & filename) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string & filename) ITK_OVERRIDE;
void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
@@ -155,14 +155,14 @@ protected:
virtual TargetSampleType DoPredict(
const InputSampleType& input,
- ConfidenceValueType * quality = ITK_NULLPTR) const;
+ ConfidenceValueType * quality = ITK_NULLPTR) const ITK_OVERRIDE;
virtual void DoPredictBatch(
const InputListSampleType *,
const unsigned int & startIndex,
const unsigned int & size,
TargetListSampleType *,
- ConfidenceListSampleType * quality = ITK_NULLPTR) const;
+ ConfidenceListSampleType * quality = ITK_NULLPTR) const ITK_OVERRIDE;
private:
/** Internal Network */
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
index d5538c1700..e3fdf5d8f5 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
@@ -115,7 +115,7 @@ protected:
~ImageDimensionalityReductionFilter() ITK_OVERRIDE {}
/** Generate output information */
- virtual void GenerateOutputInformation();
+ virtual void GenerateOutputInformation() ITK_OVERRIDE;
/** Threaded generate data */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
index dd8f7a6992..064ca263da 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
@@ -80,8 +80,8 @@ public:
itkSetMacro(WriteEigenvectors, bool);
itkGetMacro(WriteEigenvectors, bool);
- bool CanReadFile(const std::string & filename);
- bool CanWriteFile(const std::string & filename);
+ bool CanReadFile(const std::string & filename) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string & filename) ITK_OVERRIDE;
void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
@@ -94,7 +94,7 @@ protected:
virtual TargetSampleType DoPredict(
const InputSampleType& input,
- ConfidenceValueType * quality = ITK_NULLPTR) const;
+ ConfidenceValueType * quality = ITK_NULLPTR) const ITK_OVERRIDE;
virtual void DoPredictBatch(
const InputListSampleType *,
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
index 7f6fb2b08e..5aa7130a6a 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
@@ -101,11 +101,11 @@ public:
itkSetMacro(Seed, unsigned int);
itkGetMacro(Seed, unsigned int);
- bool CanReadFile(const std::string & filename);
- bool CanWriteFile(const std::string & filename);
+ bool CanReadFile(const std::string & filename) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string & filename) ITK_OVERRIDE;
- void Save(const std::string & filename, const std::string & name="") ;
- void Load(const std::string & filename, const std::string & name="") ;
+ void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
void Train() ITK_OVERRIDE;
@@ -118,7 +118,7 @@ private:
virtual TargetSampleType DoPredict(
const InputSampleType& input,
- ConfidenceValueType * quality = ITK_NULLPTR) const;
+ ConfidenceValueType * quality = ITK_NULLPTR) const ITK_OVERRIDE;
/** Map size (width, height) */
SizeType m_MapSize;
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
index 8d2c0c8123..162aa10255 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
@@ -148,7 +148,7 @@ protected:
virtual void DoPredictBatch(const InputListSampleType *, const unsigned int & startIndex, const unsigned int & size, TargetListSampleType *, ConfidenceListSampleType * = ITK_NULLPTR) const ITK_OVERRIDE;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
SharkRandomForestsMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
index 313d9db9a1..7361ee38cc 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
@@ -42,8 +42,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- virtual const char* GetITKSourceVersion(void) const;
- virtual const char* GetDescription(void) const;
+ virtual const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
+ virtual const char* GetDescription(void) const ITK_OVERRIDE;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
index ef74d52f40..a479248e1e 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
@@ -140,7 +140,7 @@ protected:
DataType NormalizeData(const DataType &data) const;
/** PrintSelf method */
- void PrintSelf(std::ostream &os, itk::Indent indent) const;
+ void PrintSelf(std::ostream &os, itk::Indent indent) const ITK_OVERRIDE;
private:
SharkKMeansMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
index a072d5d719..3c9ed55da1 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- virtual const char* GetITKSourceVersion(void) const;
- virtual const char* GetDescription(void) const;
+ virtual const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
+ virtual const char* GetDescription(void) const ITK_OVERRIDE;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
diff --git a/Modules/Radiometry/Simulation/include/otbProSailParameters.h b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
index ea021d2811..c2264c104c 100644
--- a/Modules/Radiometry/Simulation/include/otbProSailParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
@@ -115,7 +115,7 @@ class ITK_EXPORT ProSailParameters : public itk::DataObject
/** Destructor */
virtual ~ProSailParameters() {};
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
diff --git a/Modules/Wrappers/SWIG/src/python/itkPyCommand.h b/Modules/Wrappers/SWIG/src/python/itkPyCommand.h
index d65c4eea7b..f7f28333ea 100644
--- a/Modules/Wrappers/SWIG/src/python/itkPyCommand.h
+++ b/Modules/Wrappers/SWIG/src/python/itkPyCommand.h
@@ -70,8 +70,8 @@ public:
PyObject * GetCommandCallable();
- void Execute(Object *, const EventObject&);
- void Execute(const Object *, const EventObject&);
+ void Execute(Object *, const EventObject&) ITK_OVERRIDE;
+ void Execute(const Object *, const EventObject&) ITK_OVERRIDE;
protected:
PyCommand();
--
GitLab