Merge pull request #23 from zachary-williamson/master

COMP: Use override annotations on overridden functions

Author: thewtex

include/itkArrivalFunctionToPathFilter.h

@@ -58,13 +58,13 @@ class ArrivalFunctionToPathCommand : public itk::Command
   itkGetConstObjectMacro( Filter, FilterType );
 
   /** Execute */
-  void Execute(itk::Object *caller, const itk::EventObject & event)
+  void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE
     {
     Execute( (const itk::Object *)caller, event);
     }
 
   /** Execute */
-  void Execute(const itk::Object * object, const itk::EventObject & event)
+  void Execute(const itk::Object * object, const itk::EventObject & event) ITK_OVERRIDE
     {
     if( ! itk::IterationEvent().CheckEvent( &event ) )
       {
@@ -211,13 +211,13 @@ class ITK_EXPORT ArrivalFunctionToPathFilter :
 protected:
   ArrivalFunctionToPathFilter();
   ~ArrivalFunctionToPathFilter();
-  virtual void PrintSelf(std::ostream& os, Indent indent) const;
+  virtual void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
 
   /** Override since the filter needs all the data for the algorithm */
-  void GenerateInputRequestedRegion();
+  void GenerateInputRequestedRegion() ITK_OVERRIDE;
 
   /** Implemention of algorithm */
-  void GenerateData(void);
+  void GenerateData(void) ITK_OVERRIDE;
 
   /** Get the arrival function from which to extract the path. */
   virtual unsigned int GetNumberOfPathsToExtract( ) const;

include/itkIterateNeighborhoodOptimizer.h

@@ -71,7 +71,7 @@ class MinimalPathExtraction_EXPORT IterateNeighborhoodOptimizer :
   virtual void AdvanceOneStep( void );
 
   /** Start optimization. */
-  void StartOptimization( void );
+  void StartOptimization( void ) ITK_OVERRIDE;
 
   /** Resume previously stopped optimization with current parameters
    * \sa StopOptimization. */
@@ -105,7 +105,7 @@ class MinimalPathExtraction_EXPORT IterateNeighborhoodOptimizer :
 protected:
   IterateNeighborhoodOptimizer();
   virtual ~IterateNeighborhoodOptimizer() {};
-  void PrintSelf(std::ostream& os, Indent indent) const;
+  void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
 
 private:
   IterateNeighborhoodOptimizer(const Self&); //purposely not implemented

include/itkPhysicalCentralDifferenceImageFunction.h

@@ -89,7 +89,7 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
    * \warning this method caches BufferedRegion information.
    * If the BufferedRegion has changed, user must call
    * SetInputImage again to update cached values. */
-  virtual void SetInputImage( const InputImageType * ptr )
+  virtual void SetInputImage( const InputImageType * ptr ) ITK_OVERRIDE
     {
         this->Superclass::SetInputImage( ptr );
         if ( m_Interpolator.IsNotNull() )
@@ -103,7 +103,7 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
    *  No bounds checking is done. The point is assume to lie within the
    *  image buffer. ImageFunction::IsInsideBuffer() can be used to check
    *  bounds before calling this method. */
-  virtual OutputType EvaluateAtIndex( const IndexType& index ) const
+  virtual OutputType EvaluateAtIndex( const IndexType& index ) const ITK_OVERRIDE
     {
     PointType point;
     m_Interpolator->GetInputImage()->TransformIndexToPhysicalPoint( index, point );
@@ -117,7 +117,7 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
    *  image buffer. ImageFunction::IsInsideBuffer() can be used to check
    *  bounds before calling this method. */
   virtual OutputType EvaluateAtContinuousIndex(
-    const ContinuousIndexType& cindex ) const
+    const ContinuousIndexType& cindex ) const ITK_OVERRIDE
     {
     PointType point;
     m_Interpolator->GetInputImage()->TransformContinuousIndexToPhysicalPoint( cindex, point );
@@ -130,12 +130,12 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
    *  No bounds checking is done. The point is assume to lie within the
    *  image buffer. ImageFunction::IsInsideBuffer() can be used to check
    *  bounds before calling this method. */
-   virtual OutputType Evaluate( const PointType& point ) const;
+   virtual OutputType Evaluate( const PointType& point ) const ITK_OVERRIDE;
 
 protected:
   PhysicalCentralDifferenceImageFunction();
   ~PhysicalCentralDifferenceImageFunction(){};
-  void PrintSelf(std::ostream& os, Indent indent) const;
+  void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
 
 private:
   PhysicalCentralDifferenceImageFunction( const Self& ); //purposely not implemented

include/itkSingleImageCostFunction.h

@@ -116,22 +116,22 @@ class ITK_EXPORT SingleImageCostFunction :
   virtual void Initialize(void) throw ( ExceptionObject );
 
   /** Return the number of parameters required by the Transform */
-  unsigned int GetNumberOfParameters(void) const
+  unsigned int GetNumberOfParameters(void) const ITK_OVERRIDE
   { return ImageDimension; }
 
   /** This method returns the value of the cost function corresponding
     * to the specified parameters. */
-  virtual MeasureType GetValue( const ParametersType & parameters ) const;
+  virtual MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE;
 
   /** This method returns the derivative of the cost function corresponding
     * to the specified parameters. */
   virtual void GetDerivative( const ParametersType & parameters,
-                              DerivativeType & derivative ) const;
+                              DerivativeType & derivative ) const ITK_OVERRIDE;
 
 protected:
   SingleImageCostFunction();
   virtual ~SingleImageCostFunction() {}
-  void PrintSelf(std::ostream& os, Indent indent) const;
+  void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
 
 private:
   SingleImageCostFunction(const Self&); //purposely not implemented

include/itkSpeedFunctionPathInformation.h

@@ -94,7 +94,7 @@ class SpeedFunctionPathInformation :
 protected:
   SpeedFunctionPathInformation( );
   virtual ~SpeedFunctionPathInformation( );
-  virtual void PrintSelf( std::ostream& os, Indent indent ) const;
+  virtual void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE;
 
   std::vector< PointType > m_Information;
   SizeValueType            m_Front;

include/itkSpeedFunctionToPathFilter.h

@@ -109,7 +109,7 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
    *  Warning: SetPathEndPoint() is not valid for this filter.
    *  This method is provided by the superclass, however it is not
    *  used by this subclass. Use AddPathInfo() instead.*/
-  void SetPathEndPoint( const PointType& )
+  void SetPathEndPoint( const PointType& ) ITK_OVERRIDE
   {
     itkWarningMacro("SetPathEndPoint() is not valid for this filter. Use AddPathInfo() instead.");
   }
@@ -118,7 +118,7 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
    *  Warning: AddPathEndPoint() is not valid for this filter.
    *  This method is provided by the superclass, however it is not
    *  used by this subclass. Use AddPathInfo() instead.*/
-  void AddPathEndPoint( const PointType& )
+  void AddPathEndPoint( const PointType& ) ITK_OVERRIDE
   {
     itkWarningMacro("AddPathEndPoint() is not valid for this filter. Use AddPathInfo() instead.");
   }
@@ -127,7 +127,7 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
    *  Warning: ClearPathEndPoints() is not valid for this filter.
    *  This method is provided by the superclass, however it is not
    *  used by this subclass. Use ClearPathInfo() instead.*/
-  void ClearPathEndPoints()
+  void ClearPathEndPoints() ITK_OVERRIDE
   {
     itkWarningMacro("ClearPathEndPoints() is not valid for this filter. Use ClearPathInfo() instead.");
   }
@@ -146,24 +146,24 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
   }
 
   /** Handle optimizer iteration events. */
-  virtual void Execute( const itk::Object * object, const itk::EventObject & event );
+  virtual void Execute( const itk::Object * object, const itk::EventObject & event ) ITK_OVERRIDE;
 
 protected:
   SpeedFunctionToPathFilter( );
   ~SpeedFunctionToPathFilter( );
-  virtual void PrintSelf( std::ostream& os, Indent indent ) const;
+  virtual void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE;
 
   /** Implemention of algorithm. */
-  void GenerateData( void );
+  void GenerateData( void ) ITK_OVERRIDE;
 
   /** Get the number of paths which the user has instructed to extracted. */
-  virtual unsigned int GetNumberOfPathsToExtract( ) const;
+  virtual unsigned int GetNumberOfPathsToExtract( ) const ITK_OVERRIDE;
 
   /** Compute the arrival function from which to extract the path. */
-  virtual InputImageType * ComputeArrivalFunction( );
+  virtual InputImageType * ComputeArrivalFunction( ) ITK_OVERRIDE;
 
   /** Override handling of optimizer iteration events to accomodate way points. */
-  virtual const PointType & GetNextEndPoint( );
+  virtual const PointType & GetNextEndPoint( ) ITK_OVERRIDE;
 
   std::vector< typename PathInformationType::Pointer > m_Information;
   InputImagePointer                                    m_CurrentArrivalFunction;