Commit b7436acc authored by Robert Maynard's avatar Robert Maynard

Add VTK_OVERRIDE to Filters Core, General and Sources.

parent d0d3f704
......@@ -85,11 +85,11 @@ struct ArrayPair : public BaseArrayPair
BaseArrayPair(num,numComp,outArray), Input(in), Output(out), NullValue(null)
{
}
virtual ~ArrayPair() //calm down some finicky compilers
~ArrayPair() VTK_OVERRIDE //calm down some finicky compilers
{
}
virtual void Copy(vtkIdType inId, vtkIdType outId)
void Copy(vtkIdType inId, vtkIdType outId) VTK_OVERRIDE
{
for (int j=0; j < this->NumComp; ++j)
{
......@@ -97,8 +97,8 @@ struct ArrayPair : public BaseArrayPair
}
}
virtual void Interpolate(int numWeights, const vtkIdType *ids,
const double *weights, vtkIdType outId)
void Interpolate(int numWeights, const vtkIdType *ids,
const double *weights, vtkIdType outId) VTK_OVERRIDE
{
for (int j=0; j < this->NumComp; ++j)
{
......@@ -111,7 +111,7 @@ struct ArrayPair : public BaseArrayPair
}
}
virtual void InterpolateEdge(vtkIdType v0, vtkIdType v1, double t, vtkIdType outId)
void InterpolateEdge(vtkIdType v0, vtkIdType v1, double t, vtkIdType outId) VTK_OVERRIDE
{
double v;
vtkIdType numComp=this->NumComp;
......@@ -123,7 +123,7 @@ struct ArrayPair : public BaseArrayPair
}
}
virtual void AssignNullValue(vtkIdType outId)
void AssignNullValue(vtkIdType outId) VTK_OVERRIDE
{
for (int j=0; j < this->NumComp; ++j)
{
......@@ -131,7 +131,7 @@ struct ArrayPair : public BaseArrayPair
}
}
virtual void Realloc(vtkIdType sze)
void Realloc(vtkIdType sze) VTK_OVERRIDE
{
this->OutputArray->WriteVoidPointer(0,sze*this->NumComp);
this->Output = static_cast<T*>(this->OutputArray->GetVoidPointer(0));
......@@ -152,11 +152,11 @@ struct RealArrayPair : public BaseArrayPair
BaseArrayPair(num,numComp,outArray), Input(in), Output(out), NullValue(null)
{
}
virtual ~RealArrayPair() //calm down some finicky compilers
~RealArrayPair() VTK_OVERRIDE //calm down some finicky compilers
{
}
virtual void Copy(vtkIdType inId, vtkIdType outId)
void Copy(vtkIdType inId, vtkIdType outId) VTK_OVERRIDE
{
for (int j=0; j < this->NumComp; ++j)
{
......@@ -164,8 +164,8 @@ struct RealArrayPair : public BaseArrayPair
}
}
virtual void Interpolate(int numWeights, const vtkIdType *ids,
const double *weights, vtkIdType outId)
void Interpolate(int numWeights, const vtkIdType *ids,
const double *weights, vtkIdType outId) VTK_OVERRIDE
{
for (int j=0; j < this->NumComp; ++j)
{
......@@ -178,7 +178,7 @@ struct RealArrayPair : public BaseArrayPair
}
}
virtual void InterpolateEdge(vtkIdType v0, vtkIdType v1, double t, vtkIdType outId)
void InterpolateEdge(vtkIdType v0, vtkIdType v1, double t, vtkIdType outId) VTK_OVERRIDE
{
double v;
vtkIdType numComp=this->NumComp;
......@@ -190,7 +190,7 @@ struct RealArrayPair : public BaseArrayPair
}
}
virtual void AssignNullValue(vtkIdType outId)
void AssignNullValue(vtkIdType outId) VTK_OVERRIDE
{
for (int j=0; j < this->NumComp; ++j)
{
......@@ -198,7 +198,7 @@ struct RealArrayPair : public BaseArrayPair
}
}
virtual void Realloc(vtkIdType sze)
void Realloc(vtkIdType sze) VTK_OVERRIDE
{
this->OutputArray->WriteVoidPointer(0,sze*this->NumComp);
this->Output = static_cast<TOutput*>(this->OutputArray->GetVoidPointer(0));
......
......@@ -66,7 +66,7 @@ public:
static vtkAppendCompositeDataLeaves* New();
vtkTypeMacro(vtkAppendCompositeDataLeaves,vtkCompositeDataSetAlgorithm);
void PrintSelf( ostream& os, vtkIndent indent );
void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
//@{
/**
......@@ -81,23 +81,23 @@ public:
protected:
vtkAppendCompositeDataLeaves();
~vtkAppendCompositeDataLeaves();
~vtkAppendCompositeDataLeaves() VTK_OVERRIDE;
/**
* Since vtkCompositeDataSet is an abstract class and we output the same types as the input,
* we must override the default implementation.
*/
virtual int RequestDataObject( vtkInformation*, vtkInformationVector**, vtkInformationVector* );
int RequestDataObject( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
/**
* Iterates over the datasets and appends corresponding notes.
*/
virtual int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* );
int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
/**
* The input is repeatable, so we override the default implementation.
*/
virtual int FillInputPortInformation( int port, vtkInformation* info );
int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
/**
* When leaf nodes are unstructured grids, this uses a vtkAppendFilter to merge them.
......
......@@ -42,7 +42,7 @@ public:
static vtkAppendFilter *New();
vtkTypeMacro(vtkAppendFilter,vtkUnstructuredGridAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Get any input of this filter.
......@@ -94,13 +94,13 @@ public:
protected:
vtkAppendFilter();
~vtkAppendFilter();
~vtkAppendFilter() VTK_OVERRIDE;
// Usual data generation method
virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
virtual int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **, vtkInformationVector *);
virtual int FillInputPortInformation(int port, vtkInformation *info);
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
// list of data sets to append together.
// Here as a convenience. It is a copy of the input array.
......
......@@ -45,7 +45,7 @@ public:
static vtkAppendPolyData *New();
vtkTypeMacro(vtkAppendPolyData,vtkPolyDataAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
//@{
/**
......@@ -120,18 +120,18 @@ public:
protected:
vtkAppendPolyData();
~vtkAppendPolyData();
~vtkAppendPolyData() VTK_OVERRIDE;
// Flag for selecting parallel streaming behavior
int ParallelStreaming;
int OutputPointsPrecision;
// Usual data generation method
virtual int RequestData(vtkInformation *,
vtkInformationVector **, vtkInformationVector *);
virtual int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **, vtkInformationVector *);
virtual int FillInputPortInformation(int, vtkInformation *);
int RequestData(vtkInformation *,
vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
// An efficient templated way to append data.
void AppendData(vtkDataArray *dest, vtkDataArray *src, vtkIdType offset);
......
......@@ -40,7 +40,7 @@ public:
static vtkAppendSelection *New();
vtkTypeMacro(vtkAppendSelection,vtkSelectionAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
//@{
/**
......@@ -99,12 +99,12 @@ public:
protected:
vtkAppendSelection();
~vtkAppendSelection();
~vtkAppendSelection() VTK_OVERRIDE;
// Usual data generation method
virtual int RequestData(vtkInformation *,
vtkInformationVector **, vtkInformationVector *);
virtual int FillInputPortInformation(int, vtkInformation *);
int RequestData(vtkInformation *,
vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
private:
// hide the superclass' AddInput() from the user and the compiler
......
......@@ -76,7 +76,7 @@ class VTKFILTERSCORE_EXPORT vtkArrayCalculator : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkArrayCalculator,vtkDataSetAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
static vtkArrayCalculator *New();
......@@ -263,9 +263,9 @@ public:
protected:
vtkArrayCalculator();
~vtkArrayCalculator();
~vtkArrayCalculator() VTK_OVERRIDE;
virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
char * Function;
char * ResultArrayName;
......
......@@ -68,7 +68,7 @@ class VTKFILTERSCORE_EXPORT vtkAssignAttribute : public vtkPassInputTypeAlgorith
{
public:
vtkTypeMacro(vtkAssignAttribute,vtkPassInputTypeAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Create a new vtkAssignAttribute.
......@@ -111,11 +111,11 @@ protected:
};
vtkAssignAttribute();
virtual ~vtkAssignAttribute();
~vtkAssignAttribute() VTK_OVERRIDE;
int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
int FillInputPortInformation(int, vtkInformation *);
int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
char* FieldName;
int FieldTypeAssignment;
......
......@@ -48,7 +48,7 @@
class VTKFILTERSCORE_EXPORT vtkAttributeDataToFieldDataFilter : public vtkDataSetAlgorithm
{
public:
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
vtkTypeMacro(vtkAttributeDataToFieldDataFilter,vtkDataSetAlgorithm);
/**
......@@ -68,9 +68,9 @@ public:
protected:
vtkAttributeDataToFieldDataFilter();
~vtkAttributeDataToFieldDataFilter() {}
~vtkAttributeDataToFieldDataFilter() VTK_OVERRIDE {}
virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *); //generate output data
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; //generate output data
int PassAttributeData;
private:
......
......@@ -44,7 +44,7 @@ public:
typedef vtkContourValues vtkBinValues;
vtkTypeMacro(vtkBinCellDataFilter,vtkDataSetAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Construct object with initial range (VTK_DOUBLE_MIN, VTK_DOUBLE_MAX) and
......@@ -177,7 +177,7 @@ public:
protected:
vtkBinCellDataFilter();
~vtkBinCellDataFilter();
~vtkBinCellDataFilter() VTK_OVERRIDE;
int SpatialMatch;
......@@ -190,12 +190,12 @@ protected:
vtkBinValues *BinValues;
vtkCellLocator *CellLocator;
virtual int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
virtual int RequestInformation(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
int RequestInformation(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
virtual void CreateDefaultLocator();
......
......@@ -45,7 +45,7 @@ class VTKFILTERSCORE_EXPORT vtkCellDataToPointData : public vtkDataSetAlgorithm
public:
static vtkCellDataToPointData *New();
vtkTypeMacro(vtkCellDataToPointData,vtkDataSetAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
//@{
/**
......@@ -60,11 +60,11 @@ public:
protected:
vtkCellDataToPointData();
~vtkCellDataToPointData() {}
~vtkCellDataToPointData() VTK_OVERRIDE {}
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
// Special traversal algorithm for unstructured grid
int RequestDataForUnstructuredGrid
......
......@@ -39,7 +39,7 @@ class VTKFILTERSCORE_EXPORT vtkCenterOfMass : public vtkPointSetAlgorithm
public:
static vtkCenterOfMass *New();
vtkTypeMacro(vtkCenterOfMass,vtkPointSetAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
//@{
/**
......@@ -74,7 +74,7 @@ protected:
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector );
vtkInformationVector* outputVector ) VTK_OVERRIDE;
private:
......
......@@ -74,7 +74,7 @@ class VTKFILTERSCORE_EXPORT vtkCleanPolyData : public vtkPolyDataAlgorithm
{
public:
static vtkCleanPolyData *New();
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
vtkTypeMacro(vtkCleanPolyData,vtkPolyDataAlgorithm);
//@{
......@@ -166,7 +166,7 @@ public:
/**
* Get the MTime of this object also considering the locator.
*/
vtkMTimeType GetMTime();
vtkMTimeType GetMTime() VTK_OVERRIDE;
/**
* Perform operation on a point
......@@ -199,11 +199,11 @@ public:
protected:
vtkCleanPolyData();
~vtkCleanPolyData();
~vtkCleanPolyData() VTK_OVERRIDE;
// Usual data generation method
virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int PointMerging;
double Tolerance;
......
......@@ -69,7 +69,7 @@ class VTKFILTERSCORE_EXPORT vtkClipPolyData : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkClipPolyData,vtkPolyDataAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Construct with user-specified implicit function; InsideOut turned off;
......@@ -167,7 +167,7 @@ public:
/**
* Return the mtime also considering the locator and clip function.
*/
vtkMTimeType GetMTime();
vtkMTimeType GetMTime() VTK_OVERRIDE;
//@{
/**
......@@ -182,9 +182,9 @@ public:
protected:
vtkClipPolyData(vtkImplicitFunction *cf=NULL);
~vtkClipPolyData();
~vtkClipPolyData() VTK_OVERRIDE;
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
vtkImplicitFunction *ClipFunction;
vtkIncrementalPointLocator *Locator;
......
......@@ -34,14 +34,14 @@ public:
static vtkCompositeCutter *New();
void PrintSelf(ostream& os, vtkIndent indent);;
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;;
protected:
vtkCompositeCutter(vtkImplicitFunction *cf=NULL);
virtual ~vtkCompositeCutter();
virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
virtual int FillInputPortInformation(int port, vtkInformation *info);
~vtkCompositeCutter() VTK_OVERRIDE;
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
private:
vtkCompositeCutter(const vtkCompositeCutter&) VTK_DELETE_FUNCTION;
......
......@@ -47,7 +47,7 @@ class VTKFILTERSCORE_EXPORT vtkCompositeDataProbeFilter : public vtkProbeFilter
public:
static vtkCompositeDataProbeFilter* New();
vtkTypeMacro(vtkCompositeDataProbeFilter, vtkProbeFilter);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
//@{
/**
......@@ -69,13 +69,13 @@ public:
protected:
vtkCompositeDataProbeFilter();
~vtkCompositeDataProbeFilter();
~vtkCompositeDataProbeFilter() VTK_OVERRIDE;
/**
* Change input information to accept composite datasets as the input which
* is probed into.
*/
virtual int FillInputPortInformation(int port, vtkInformation* info);
int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
/**
* Builds the field list using the composite dataset source.
......@@ -85,18 +85,18 @@ protected:
/**
* Initializes output and various arrays which keep track for probing status.
*/
virtual void InitializeForProbing(vtkDataSet *input, vtkDataSet *output);
void InitializeForProbing(vtkDataSet *input, vtkDataSet *output) VTK_OVERRIDE;
/**
* Handle composite input.
*/
virtual int RequestData(vtkInformation *,
vtkInformationVector **, vtkInformationVector *);
int RequestData(vtkInformation *,
vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
/**
* Create a default executive.
*/
virtual vtkExecutive* CreateDefaultExecutive();
vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
bool PassPartialArrays;
private:
......
......@@ -70,7 +70,7 @@ class VTKFILTERSCORE_EXPORT vtkConnectivityFilter : public vtkUnstructuredGridAl
{
public:
vtkTypeMacro(vtkConnectivityFilter,vtkUnstructuredGridAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Construct with default extraction mode to extract largest regions.
......@@ -183,11 +183,11 @@ public:
protected:
vtkConnectivityFilter();
~vtkConnectivityFilter();
~vtkConnectivityFilter() VTK_OVERRIDE;
// Usual data generation method
virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
virtual int FillInputPortInformation(int port, vtkInformation *info);
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
int ColorRegions; //boolean turns on/off scalar gen for separate regions
int ExtractionMode; //how to extract regions
......
......@@ -64,7 +64,7 @@ class VTKFILTERSCORE_EXPORT vtkContourFilter : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkContourFilter,vtkPolyDataAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Construct object with initial range (0,1) and single contour value
......@@ -89,7 +89,7 @@ public:
/**
* Modified GetMTime Because we delegate to vtkContourValues
*/
vtkMTimeType GetMTime();
vtkMTimeType GetMTime() VTK_OVERRIDE;
//@{
/**
......@@ -197,17 +197,17 @@ public:
protected:
vtkContourFilter();
~vtkContourFilter();
~vtkContourFilter() VTK_OVERRIDE;
void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
virtual int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
vtkInformationVector*);
virtual int FillInputPortInformation(int port, vtkInformation *info);
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
vtkContourValues *ContourValues;
int ComputeNormals;
......
......@@ -62,7 +62,7 @@ class VTKFILTERSCORE_EXPORT vtkContourGrid : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkContourGrid,vtkPolyDataAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**