Commit 160f22af authored by Ben Boeckel's avatar Ben Boeckel
Browse files

clang-tidy: fix override issues

This run of `clang-tidy` removes unnecessary `virtual` keywords and adds
`VTK_OVERRIDE` where necessary.
parent 7c71a290
......@@ -82,7 +82,7 @@ public:
/**
* Reset ActivePlotSet flag and call superclass method
*/
virtual void SetSize(const vtkVector2i& size) VTK_OVERRIDE;
void SetSize(const vtkVector2i& size) VTK_OVERRIDE;
/**
* Get the position of the active plot.
......
......@@ -48,7 +48,7 @@ protected:
* This is called by the superclass.
* This is the method you should override.
*/
virtual int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
private:
......
......@@ -166,10 +166,10 @@ protected:
double Ray[3];
double Normal[3];
virtual int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
virtual int FillInputPortInformation(int port,
vtkInformation *info) VTK_OVERRIDE;
int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
int FillInputPortInformation(int port,
vtkInformation *info) VTK_OVERRIDE;
private:
vtkSphereTreeFilter(const vtkSphereTreeFilter&) VTK_DELETE_FUNCTION;
......
......@@ -35,7 +35,7 @@ class VTKFILTERSHYBRID_EXPORT vtkTemporalArrayOperatorFilter :
public:
static vtkTemporalArrayOperatorFilter* New();
vtkTypeMacro(vtkTemporalArrayOperatorFilter, vtkMultiTimeStepAlgorithm);
virtual void PrintSelf(ostream &OS, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream &OS, vtkIndent indent) VTK_OVERRIDE;
enum OperatorType
{
......@@ -81,19 +81,19 @@ public:
protected:
vtkTemporalArrayOperatorFilter();
virtual ~vtkTemporalArrayOperatorFilter() VTK_OVERRIDE;
virtual int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
virtual int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
virtual int RequestDataObject(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
virtual int RequestInformation(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
virtual int RequestUpdateExtent(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
virtual int RequestData(vtkInformation*, vtkInformationVector**,
~vtkTemporalArrayOperatorFilter() VTK_OVERRIDE;
int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
int RequestDataObject(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
int RequestInformation(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
int RequestUpdateExtent(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
int GetInputArrayAssociation();
virtual vtkDataObject* Process(vtkDataObject*, vtkDataObject*);
......
......@@ -52,21 +52,21 @@ public:
/**
* Execute the parallel calculations required by the Learn option.
*/
virtual void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
/**
* Execute the calculations required by the Test option.
* NB: Not implemented for more than 1 processor
*/
virtual void Test( vtkTable*,
vtkMultiBlockDataSet*,
vtkTable* ) VTK_OVERRIDE;
void Test( vtkTable*,
vtkMultiBlockDataSet*,
vtkTable* ) VTK_OVERRIDE;
protected:
vtkPAutoCorrelativeStatistics();
~vtkPAutoCorrelativeStatistics();
~vtkPAutoCorrelativeStatistics() VTK_OVERRIDE;
vtkMultiProcessController* Controller;
private:
......
......@@ -54,9 +54,9 @@ public:
protected:
vtkPBivariateLinearTableThreshold();
virtual ~vtkPBivariateLinearTableThreshold();
~vtkPBivariateLinearTableThreshold() VTK_OVERRIDE;
virtual int RequestData(
int RequestData(
vtkInformation*,
vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
......
......@@ -67,13 +67,13 @@ public:
/**
* Execute the parallel calculations required by the Learn option.
*/
virtual void Learn( vtkTable*,
vtkTable*,
vtkMultiBlockDataSet* ) VTK_OVERRIDE;
void Learn( vtkTable*,
vtkTable*,
vtkMultiBlockDataSet* ) VTK_OVERRIDE;
protected:
vtkPContingencyStatistics();
~vtkPContingencyStatistics();
~vtkPContingencyStatistics() VTK_OVERRIDE;
/**
* Reduce the collection of local contingency tables to the global one
......
......@@ -57,21 +57,21 @@ public:
/**
* Execute the parallel calculations required by the Learn option.
*/
virtual void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
/**
* Execute the calculations required by the Test option.
* NB: Not implemented for more than 1 processor
*/
virtual void Test( vtkTable*,
vtkMultiBlockDataSet*,
vtkTable* ) VTK_OVERRIDE;
void Test( vtkTable*,
vtkMultiBlockDataSet*,
vtkTable* ) VTK_OVERRIDE;
protected:
vtkPCorrelativeStatistics();
~vtkPCorrelativeStatistics();
~vtkPCorrelativeStatistics() VTK_OVERRIDE;
vtkMultiProcessController* Controller;
private:
......
......@@ -57,13 +57,13 @@ public:
/**
* Execute the parallel calculations required by the Learn option.
*/
virtual void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
protected:
vtkPDescriptiveStatistics();
~vtkPDescriptiveStatistics();
~vtkPDescriptiveStatistics() VTK_OVERRIDE;
vtkMultiProcessController* Controller;
private:
......
......@@ -57,33 +57,33 @@ public:
/**
* Subroutine to update new cluster centers from the old centers.
*/
virtual void UpdateClusterCenters( vtkTable* newClusterElements,
vtkTable* curClusterElements,
vtkIdTypeArray* numMembershipChanges,
vtkIdTypeArray* numElementsInCluster,
vtkDoubleArray* error,
vtkIdTypeArray* startRunID,
vtkIdTypeArray* endRunID,
vtkIntArray *computeRun ) VTK_OVERRIDE;
void UpdateClusterCenters( vtkTable* newClusterElements,
vtkTable* curClusterElements,
vtkIdTypeArray* numMembershipChanges,
vtkIdTypeArray* numElementsInCluster,
vtkDoubleArray* error,
vtkIdTypeArray* startRunID,
vtkIdTypeArray* endRunID,
vtkIntArray *computeRun ) VTK_OVERRIDE;
/**
* Subroutine to get the total number of data objects.
*/
virtual vtkIdType GetTotalNumberOfObservations( vtkIdType numObservations ) VTK_OVERRIDE;
vtkIdType GetTotalNumberOfObservations( vtkIdType numObservations ) VTK_OVERRIDE;
/**
* Subroutine to initialize cluster centerss if not provided by the user.
*/
virtual void CreateInitialClusterCenters(vtkIdType numToAllocate,
vtkIdTypeArray* numberOfClusters,
vtkTable* inData,
vtkTable* curClusterElements,
vtkTable* newClusterElements) VTK_OVERRIDE;
void CreateInitialClusterCenters(vtkIdType numToAllocate,
vtkIdTypeArray* numberOfClusters,
vtkTable* inData,
vtkTable* curClusterElements,
vtkTable* newClusterElements) VTK_OVERRIDE;
protected:
vtkPKMeansStatistics();
~vtkPKMeansStatistics();
~vtkPKMeansStatistics() VTK_OVERRIDE;
vtkMultiProcessController* Controller;
......
......@@ -61,16 +61,16 @@ public:
protected:
vtkPMultiCorrelativeStatistics();
~vtkPMultiCorrelativeStatistics();
~vtkPMultiCorrelativeStatistics() VTK_OVERRIDE;
vtkMultiProcessController* Controller;
// Execute the parallel calculations required by the Learn option.
virtual void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
virtual vtkOrderStatistics* CreateOrderStatisticsInstance() VTK_OVERRIDE;
vtkOrderStatistics* CreateOrderStatisticsInstance() VTK_OVERRIDE;
private:
vtkPMultiCorrelativeStatistics(const vtkPMultiCorrelativeStatistics&) VTK_DELETE_FUNCTION;
......
......@@ -68,13 +68,13 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPOrderStatistics : public vtkOrderS
/**
* Execute the parallel calculations required by the Learn option.
*/
virtual void Learn( vtkTable*,
vtkTable*,
vtkMultiBlockDataSet* ) VTK_OVERRIDE;
void Learn( vtkTable*,
vtkTable*,
vtkMultiBlockDataSet* ) VTK_OVERRIDE;
protected:
vtkPOrderStatistics();
~vtkPOrderStatistics();
~vtkPOrderStatistics() VTK_OVERRIDE;
/**
* Reduce the collection of local histograms to the global one for data inputs
......
......@@ -57,24 +57,24 @@ public:
protected:
vtkPPCAStatistics();
~vtkPPCAStatistics();
~vtkPPCAStatistics() VTK_OVERRIDE;
vtkMultiProcessController* Controller;
// Execute the parallel calculations required by the Learn option.
virtual void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
void Learn( vtkTable* inData,
vtkTable* inParameters,
vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
/**
* Execute the calculations required by the Test option.
* NB: Not implemented for more than 1 processor
*/
virtual void Test( vtkTable*,
vtkMultiBlockDataSet*,
vtkTable* ) VTK_OVERRIDE;
void Test( vtkTable*,
vtkMultiBlockDataSet*,
vtkTable* ) VTK_OVERRIDE;
virtual vtkOrderStatistics* CreateOrderStatisticsInstance() VTK_OVERRIDE;
vtkOrderStatistics* CreateOrderStatisticsInstance() VTK_OVERRIDE;
private:
vtkPPCAStatistics(const vtkPPCAStatistics&) VTK_DELETE_FUNCTION;
......
......@@ -206,7 +206,7 @@ public:
protected:
vtkUnsignedDistance();
~vtkUnsignedDistance() override;
~vtkUnsignedDistance() VTK_OVERRIDE;
int Dimensions[3];
double Bounds[6];
......@@ -221,12 +221,12 @@ protected:
// Flag tracks whether process needs initialization
int Initialized;
virtual int RequestInformation (vtkInformation *,
vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
virtual int RequestData (vtkInformation *,
vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
virtual int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
int RequestData (vtkInformation *,
vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
private:
vtkUnsignedDistance(const vtkUnsignedDistance&) VTK_DELETE_FUNCTION;
......
......@@ -127,7 +127,7 @@ protected:
vtkCellSizeFilter();
~vtkCellSizeFilter() VTK_OVERRIDE;
virtual int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
bool ComputeDataSet(vtkDataSet* input, vtkDataSet* output, vtkDoubleArray* sum);
......
......@@ -104,7 +104,7 @@ public:
protected:
QVTKOpenGLWidgetObserver() {}
~QVTKOpenGLWidgetObserver() {}
~QVTKOpenGLWidgetObserver() VTK_OVERRIDE {}
QPointer<QVTKOpenGLWidget> Target;
};
......
......@@ -126,7 +126,7 @@ class VTKGUISUPPORTQT_EXPORT QVTKOpenGLWidget : public QOpenGLWidget
typedef QOpenGLWidget Superclass;
public:
QVTKOpenGLWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
virtual ~QVTKOpenGLWidget();
~QVTKOpenGLWidget() VTK_OVERRIDE;
//@{
/**
......
......@@ -37,7 +37,7 @@ class VTKIOGDAL_EXPORT vtkGDAL : public vtkObject
private:
vtkGDAL(); // Static class
~vtkGDAL();
~vtkGDAL() VTK_OVERRIDE;
vtkGDAL(const vtkGDAL&) VTK_DELETE_FUNCTION;
void operator=(const vtkGDAL&) VTK_DELETE_FUNCTION;
};
......
......@@ -41,10 +41,10 @@ class VTKIOGDAL_EXPORT vtkGDALRasterReader : public vtkImageReader2
public:
static vtkGDALRasterReader* New();
vtkTypeMacro(vtkGDALRasterReader, vtkImageReader2);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
vtkGDALRasterReader();
virtual ~vtkGDALRasterReader();
~vtkGDALRasterReader() VTK_OVERRIDE;
//@{
/**
......@@ -108,16 +108,16 @@ public:
protected:
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
virtual int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
virtual int FillOutputPortInformation(int port,
vtkInformation* info);
int FillOutputPortInformation(int port,
vtkInformation* info) VTK_OVERRIDE;
protected:
int TargetDimensions[2];
......
......@@ -39,7 +39,7 @@ class VTKIOGDAL_EXPORT vtkGDALVectorReader : public vtkMultiBlockDataSetAlgorith
{
public:
static vtkGDALVectorReader* New();
virtual void PrintSelf( ostream& os, vtkIndent indent );
void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
vtkTypeMacro(vtkGDALVectorReader,vtkMultiBlockDataSetAlgorithm);
vtkSetStringMacro(FileName);
......@@ -120,10 +120,10 @@ public:
protected:
vtkGDALVectorReader();
virtual ~vtkGDALVectorReader();
~vtkGDALVectorReader() VTK_OVERRIDE;
int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* );
int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* );
int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
int InitializeInternal();
......
Supports Markdown
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