Skip to content

Commit

Permalink
COMP: Use C++11 override directly
Browse files Browse the repository at this point in the history
git grep -l "ITK_OVERRIDE" |   fgrep -v itk_compiler_detection.h | fgrep -v CMakeLists.txt |fgrep -v .cmake |   xargs sed -i '' -e "s/ITK_OVERRIDE/override/g"
  • Loading branch information
hjmjohnson committed Nov 8, 2018
1 parent 0d8aa6b commit 654e7d4
Show file tree
Hide file tree
Showing 81 changed files with 307 additions and 307 deletions.
4 changes: 2 additions & 2 deletions Examples/Atropos.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ class CommandIterationUpdate : public itk::Command
};
public:

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
{
const TFilter * filter =
dynamic_cast<const TFilter *>( object );
Expand Down
4 changes: 2 additions & 2 deletions Examples/DenoiseImage.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class CommandProgressUpdate : public itk::Command

public:

void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE
void Execute(itk::Object *caller, const itk::EventObject & event) override
{
itk::ProcessObject *po = dynamic_cast<itk::ProcessObject *>( caller );
if (! po) return;
Expand All @@ -59,7 +59,7 @@ class CommandProgressUpdate : public itk::Command
}
}

void Execute(const itk::Object * object, const itk::EventObject & event) ITK_OVERRIDE
void Execute(const itk::Object * object, const itk::EventObject & event) override
{
itk::ProcessObject *po = dynamic_cast<itk::ProcessObject *>(
const_cast<itk::Object *>( object ) );
Expand Down
4 changes: 2 additions & 2 deletions Examples/KellyKapowski.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ class CommandIterationUpdate : public itk::Command
};
public:

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
{
const TFilter * filter =
dynamic_cast<const TFilter *>( object );
Expand Down
4 changes: 2 additions & 2 deletions Examples/N3BiasFieldCorrection.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ class CommandIterationUpdate : public itk::Command
};
public:

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
{
const TFilter * filter =
dynamic_cast<const TFilter *>( object );
Expand Down
4 changes: 2 additions & 2 deletions Examples/N4BiasFieldCorrection.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ class CommandIterationUpdate : public itk::Command
};
public:

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
{
const TFilter * filter =
dynamic_cast<const TFilter *>( object );
Expand Down
4 changes: 2 additions & 2 deletions Examples/NonLocalSuperResolution.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class CommandProgressUpdate : public itk::Command

public:

void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE
void Execute(itk::Object *caller, const itk::EventObject & event) override
{
const TFilter * filter = dynamic_cast<const TFilter *>( caller );

Expand Down Expand Up @@ -75,7 +75,7 @@ class CommandProgressUpdate : public itk::Command
}
}

void Execute(const itk::Object * object, const itk::EventObject & event) ITK_OVERRIDE
void Execute(const itk::Object * object, const itk::EventObject & event) override
{
const TFilter * filter = dynamic_cast<const TFilter *>( object );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ class antsDisplacementAndVelocityFieldRegistrationCommandIterationUpdate : publi

public:

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
{
TFilter const * const filter = dynamic_cast<const TFilter *>( object );

Expand Down
4 changes: 2 additions & 2 deletions Examples/antsJointFusion.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class CommandProgressUpdate : public itk::Command

public:

void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE
void Execute(itk::Object *caller, const itk::EventObject & event) override
{
const TFilter * filter = dynamic_cast<const TFilter *>( caller );

Expand Down Expand Up @@ -73,7 +73,7 @@ class CommandProgressUpdate : public itk::Command
}
}

void Execute(const itk::Object * object, const itk::EventObject & event) ITK_OVERRIDE
void Execute(const itk::Object * object, const itk::EventObject & event) override
{
const TFilter * filter = dynamic_cast<const TFilter *>( object );

Expand Down
4 changes: 2 additions & 2 deletions Examples/antsJointTensorFusion.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class CommandProgressUpdate : public itk::Command

public:

void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE
void Execute(itk::Object *caller, const itk::EventObject & event) override
{
itk::ProcessObject *po = dynamic_cast<itk::ProcessObject *>( caller );
if (! po) return;
Expand All @@ -64,7 +64,7 @@ class CommandProgressUpdate : public itk::Command
}
}

void Execute(const itk::Object * object, const itk::EventObject & event) ITK_OVERRIDE
void Execute(const itk::Object * object, const itk::EventObject & event) override
{
itk::ProcessObject *po = dynamic_cast<itk::ProcessObject *>(
const_cast<itk::Object *>( object ) );
Expand Down
8 changes: 4 additions & 4 deletions Examples/antsMotionCorr.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ class antsRegistrationCommandIterationUpdate : public itk::Command

public:

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
{
TFilter * filter = const_cast<TFilter *>( dynamic_cast<const TFilter *>( object ) );

Expand Down Expand Up @@ -264,12 +264,12 @@ class CommandIterationUpdate : public itk::Command
};
public:

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
{
bool verbose = false;
TFilter * filter = const_cast<TFilter *>( dynamic_cast<const TFilter *>( object ) );
Expand Down
4 changes: 2 additions & 2 deletions Examples/antsRegistrationCommandIterationUpdate.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ class antsRegistrationCommandIterationUpdate : public itk::Command

public:

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
{
TFilter const * const filter = dynamic_cast<const TFilter *>( object );

Expand Down
4 changes: 2 additions & 2 deletions Examples/antsRegistrationOptimizerCommandIterationUpdate.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ class antsRegistrationOptimizerCommandIterationUpdate : public itk::Command

public:

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 *, const itk::EventObject & event) ITK_OVERRIDE
void Execute(const itk::Object *, const itk::EventObject & event) override
{
#if 0
if( typeid( event ) == typeid( itk::InitializeEvent ) )
Expand Down
8 changes: 4 additions & 4 deletions Examples/antsSliceRegularizedRegistration.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ class antsSliceRegularizedRegistrationCommandIterationUpdate : public itk::Comma

public:

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
{
TFilter * filter = const_cast<TFilter *>( dynamic_cast<const TFilter *>( object ) );

Expand Down Expand Up @@ -265,12 +265,12 @@ class CommandIterationUpdate : public itk::Command
};
public:

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
{
TFilter * filter = const_cast<TFilter *>( dynamic_cast<const TFilter *>( object ) );

Expand Down
2 changes: 1 addition & 1 deletion Examples/itkantsRegistrationHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ class RegistrationHelper : public itk::Object

protected:
RegistrationHelper();
virtual ~RegistrationHelper() ITK_OVERRIDE;
virtual ~RegistrationHelper() override;
private:

typename itk::ImageBase<VImageDimension>::Pointer GetShrinkImageOutputInformation(const itk::ImageBase<VImageDimension> * inputImageInformation,
Expand Down
16 changes: 8 additions & 8 deletions ImageRegistration/itkANTSAffine3DTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,16 @@ class ANTSAffine3DTransform :
itkGetConstReferenceMacro( K3, TScalarType );

/** Set the parameters to the IdentityTransform */
void SetIdentity() ITK_OVERRIDE;
void SetIdentity() override;

/** Set the transformation from a container of parameters.
* This is typically used by optimizers.
* There are 7 parameters. The first four represents the
* quaternion and the last three represents the
* offset. */
void SetParameters( const ParametersType & parameters ) ITK_OVERRIDE;
void SetParameters( const ParametersType & parameters ) override;

const ParametersType & GetParameters() const ITK_OVERRIDE;
const ParametersType & GetParameters() const override;

// /** Compute the Jacobian of the transformation.
// * This method computes the Jacobian matrix of the transformation.
Expand All @@ -126,20 +126,20 @@ class ANTSAffine3DTransform :
* Get local Jacobian for the given point
* \c j will sized properly as needed.
*/
void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & j) const ITK_OVERRIDE;
void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & j) const override;

protected:
/* ANTSAffine3DTransform(const MatrixType &matrix, */
/* const OutputVectorType &offset); */
ANTSAffine3DTransform(unsigned int outputDims, unsigned int paramDims);
ANTSAffine3DTransform();
virtual ~ANTSAffine3DTransform() ITK_OVERRIDE
virtual ~ANTSAffine3DTransform() override
{
};

void ComputeMatrix() ITK_OVERRIDE;
void ComputeMatrix() override;

void ComputeMatrixParameters() ITK_OVERRIDE;
void ComputeMatrixParameters() override;

void SetVarRotation(const VnlQuaternionType & rotation)
{
Expand All @@ -148,7 +148,7 @@ class ANTSAffine3DTransform :

// const InverseMatrixType & GetInverseMatrix() const;

void PrintSelf(std::ostream & os, Indent indent) const ITK_OVERRIDE;
void PrintSelf(std::ostream & os, Indent indent) const override;

private:
ANTSAffine3DTransform(const Self &); // purposely not implemented
Expand Down
16 changes: 8 additions & 8 deletions ImageRegistration/itkANTSCenteredAffine2DTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class ANTSCenteredAffine2DTransform :
*
* \sa Transform::SetParameters()
* \sa Transform::SetFixedParameters() */
void SetParameters( const ParametersType & parameters ) ITK_OVERRIDE;
void SetParameters( const ParametersType & parameters ) override;

/** Get the parameters that uniquely define the transform
* This is typically used by optimizers.
Expand All @@ -157,7 +157,7 @@ class ANTSCenteredAffine2DTransform :
*
* \sa Transform::GetParameters()
* \sa Transform::GetFixedParameters() */
const ParametersType & GetParameters() const ITK_OVERRIDE;
const ParametersType & GetParameters() const override;

/** This method computes the Jacobian matrix of the transformation
* at a given input point.
Expand All @@ -174,7 +174,7 @@ class ANTSCenteredAffine2DTransform :
* Get local Jacobian for the given point
* \c j will sized properly as needed.
*/
void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & j) const ITK_OVERRIDE;
void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & j) const override;

/**
* This method creates and returns a new ANTSCenteredAffine2DTransform object
Expand All @@ -189,7 +189,7 @@ class ANTSCenteredAffine2DTransform :
void CloneTo( Pointer & clone ) const;

/** Reset the parameters to create and identity transform. */
void SetIdentity() ITK_OVERRIDE;
void SetIdentity() override;

protected:
// Rigid2DTransform();
Expand All @@ -200,23 +200,23 @@ class ANTSCenteredAffine2DTransform :
ANTSCenteredAffine2DTransform( unsigned int outputSpaceDimension, unsigned int parametersDimension);

// ~Rigid2DTransform();
virtual ~ANTSCenteredAffine2DTransform() ITK_OVERRIDE;
virtual ~ANTSCenteredAffine2DTransform() override;

/**
* Print contents of an ANTSCenteredAffine2DTransform
**/
void PrintSelf(std::ostream & os, Indent indent) const ITK_OVERRIDE;
void PrintSelf(std::ostream & os, Indent indent) const override;

/** Compute the matrix from angle. This is used in Set methods
* to update the underlying matrix whenever a transform parameter
* is changed. */
void ComputeMatrix() ITK_OVERRIDE;
void ComputeMatrix() override;

/** Compute the angle from the matrix. This is used to compute
* transform parameters from a given matrix. This is used in
* MatrixOffsetTransformBase::Compose() and
* MatrixOffsetTransformBase::GetInverse(). */
void ComputeMatrixParameters() ITK_OVERRIDE;
void ComputeMatrixParameters() override;

/** Update angle without recomputation of other internal variables. */
void SetVarAngle( TScalarType angle )
Expand Down
4 changes: 2 additions & 2 deletions ImageRegistration/itkANTSImageRegistrationOptimizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -2091,11 +2091,11 @@ class ANTSImageRegistrationOptimizer
}

ANTSImageRegistrationOptimizer();
virtual ~ANTSImageRegistrationOptimizer() ITK_OVERRIDE
virtual ~ANTSImageRegistrationOptimizer() override
{
}

void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE;
void PrintSelf( std::ostream& os, Indent indent ) const override;

private:
ANTSImageRegistrationOptimizer( const Self & ); // purposely not implemented
Expand Down
4 changes: 2 additions & 2 deletions ImageRegistration/itkANTSImageTransformation.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ class ANTSImageTransformation
itkBooleanMacro( WriteComponentImages );
protected:
ANTSImageTransformation();
virtual ~ANTSImageTransformation() ITK_OVERRIDE
virtual ~ANTSImageTransformation() override
{
}

void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE;
void PrintSelf( std::ostream& os, Indent indent ) const override;

private:
ANTSImageTransformation( const Self & ); // purposely not implemented
Expand Down
Loading

0 comments on commit 654e7d4

Please sign in to comment.