From db7e5217c37e01705f867061e360fdf3290704c8 Mon Sep 17 00:00:00 2001 From: tbaudier Date: Wed, 26 Apr 2017 15:18:01 +0200 Subject: [PATCH] Remove warnings with c++11 --- ...litkExplosionControlledThresholdConnectedImageFilter.h | 8 ++++---- itk/clitkInvertVFFilter.h | 4 ++-- itk/clitkInvertVFFilter.txx | 6 +++--- itk/clitkLocallyAdaptiveBinaryThresholdImageFunction.h | 8 ++++---- itk/clitkLocallyAdaptiveThresholdConnectedImageFilter.h | 8 ++++---- vv/vvQProgressDialogITKCommand.h | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/itk/clitkExplosionControlledThresholdConnectedImageFilter.h b/itk/clitkExplosionControlledThresholdConnectedImageFilter.h index 9211418..f7a31dc 100644 --- a/itk/clitkExplosionControlledThresholdConnectedImageFilter.h +++ b/itk/clitkExplosionControlledThresholdConnectedImageFilter.h @@ -62,7 +62,7 @@ public: typedef typename OutputImageType::RegionType OutputImageRegionType; typedef typename OutputImageType::PixelType OutputImagePixelType; - void PrintSelf ( std::ostream& os, itk::Indent indent ) const; + void PrintSelf ( std::ostream& os, itk::Indent indent ) const ITK_OVERRIDE; /** Clear the seeds */ void ClearSeeds(); @@ -178,11 +178,11 @@ protected: unsigned int m_MinimumSize; // Override since the filter needs all the data for the algorithm - void GenerateInputRequestedRegion(); + void GenerateInputRequestedRegion() ITK_OVERRIDE; // Override since the filter produces the entire dataset - void EnlargeOutputRequestedRegion(itk::DataObject *output); - void GenerateData(); + void EnlargeOutputRequestedRegion(itk::DataObject *output) ITK_OVERRIDE; + void GenerateData() ITK_OVERRIDE; private: ExplosionControlledThresholdConnectedImageFilter(const Self&); //purposely not implemented diff --git a/itk/clitkInvertVFFilter.h b/itk/clitkInvertVFFilter.h index 8475241..52edcd9 100644 --- a/itk/clitkInvertVFFilter.h +++ b/itk/clitkInvertVFFilter.h @@ -65,7 +65,7 @@ namespace clitk //Set Methods(inline) itkSetMacro( Verbose, bool); itkSetMacro( EdgePaddingValue, PixelType ); - void SetNumberOfThreads(unsigned int r ) + void SetNumberOfThreads(unsigned int r ) ITK_OVERRIDE { m_NumberOfThreadsIsGiven=true; m_NumberOfThreads=r; @@ -78,7 +78,7 @@ namespace clitk protected: InvertVFFilter(); ~InvertVFFilter() {}; - void GenerateData( ); + void GenerateData( ) ITK_OVERRIDE; bool m_Verbose; bool m_NumberOfThreadsIsGiven; diff --git a/itk/clitkInvertVFFilter.txx b/itk/clitkInvertVFFilter.txx index c32782f..4b98230 100644 --- a/itk/clitkInvertVFFilter.txx +++ b/itk/clitkInvertVFFilter.txx @@ -74,8 +74,8 @@ protected: ~HelperClass1() {}; //the actual processing - void BeforeThreadedGenerateData(); - void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ); + void BeforeThreadedGenerateData() ITK_OVERRIDE; + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) ITK_OVERRIDE; //member data typename WeightsImageType::Pointer m_Weights; @@ -289,7 +289,7 @@ protected: //the actual processing - void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ); + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) ITK_OVERRIDE; //member data typename WeightsImageType::Pointer m_Weights; diff --git a/itk/clitkLocallyAdaptiveBinaryThresholdImageFunction.h b/itk/clitkLocallyAdaptiveBinaryThresholdImageFunction.h index 6b32e82..f05c892 100644 --- a/itk/clitkLocallyAdaptiveBinaryThresholdImageFunction.h +++ b/itk/clitkLocallyAdaptiveBinaryThresholdImageFunction.h @@ -71,17 +71,17 @@ public: itkGetConstReferenceMacro(Radius, InputSizeType); /** Evalulate the function at specified index */ - virtual bool EvaluateAtIndex( const IndexType& index ) const; + virtual bool EvaluateAtIndex( const IndexType& index ) const ITK_OVERRIDE; /** Evaluate the function at non-integer positions */ - virtual bool Evaluate( const PointType& point ) const + virtual bool Evaluate( const PointType& point ) const ITK_OVERRIDE { IndexType index; this->ConvertPointToNearestIndex( point, index ); return this->EvaluateAtIndex( index ); } virtual bool EvaluateAtContinuousIndex( - const ContinuousIndexType& cindex ) const + const ContinuousIndexType& cindex ) const ITK_OVERRIDE { IndexType index; this->ConvertContinuousIndexToNearestIndex( cindex, index ); @@ -108,7 +108,7 @@ public: protected: LocallyAdaptiveBinaryThresholdImageFunction(); ~LocallyAdaptiveBinaryThresholdImageFunction(){}; - void PrintSelf(std::ostream& os, itk::Indent indent) const; + void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE; private: LocallyAdaptiveBinaryThresholdImageFunction( const Self& ); //purposely not implemented diff --git a/itk/clitkLocallyAdaptiveThresholdConnectedImageFilter.h b/itk/clitkLocallyAdaptiveThresholdConnectedImageFilter.h index dc71f7f..2d38caa 100644 --- a/itk/clitkLocallyAdaptiveThresholdConnectedImageFilter.h +++ b/itk/clitkLocallyAdaptiveThresholdConnectedImageFilter.h @@ -61,7 +61,7 @@ public: typedef typename OutputImageType::RegionType OutputImageRegionType; typedef typename OutputImageType::PixelType OutputImagePixelType; - void PrintSelf ( std::ostream& os, itk::Indent indent ) const; + void PrintSelf ( std::ostream& os, itk::Indent indent ) const ITK_OVERRIDE; /** Clear the seeds */ void ClearSeeds(); @@ -145,11 +145,11 @@ protected: double m_MaximumSD; // Override since the filter needs all the data for the algorithm - void GenerateInputRequestedRegion(); + void GenerateInputRequestedRegion() ITK_OVERRIDE; // Override since the filter produces the entire dataset - void EnlargeOutputRequestedRegion(itk::DataObject *output); - void GenerateData(); + void EnlargeOutputRequestedRegion(itk::DataObject *output) ITK_OVERRIDE; + void GenerateData() ITK_OVERRIDE; private: LocallyAdaptiveThresholdConnectedImageFilter(const Self&); //purposely not implemented diff --git a/vv/vvQProgressDialogITKCommand.h b/vv/vvQProgressDialogITKCommand.h index 8ac9979..39e0f0f 100644 --- a/vv/vvQProgressDialogITKCommand.h +++ b/vv/vvQProgressDialogITKCommand.h @@ -33,8 +33,8 @@ public: void Initialize(QString title, float sec, int max); - void Execute(itk::Object *caller, const itk::EventObject & event); - void Execute(const itk::Object *caller, const itk::EventObject & event); + void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE; + void Execute(const itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE; protected: vvQProgressDialogITKCommand(); -- 2.45.2