Commit 657d021e authored by Kitware Robot's avatar Kitware Robot Committed by Robert Maynard

Replace VTK_OVERRIDE with override.

Now that VTK requires a C++11 compiler we can ditch using custom typedefs
parent 6cec27f4

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -35,7 +35,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmAverageToCells : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkmAverageToCells, vtkDataSetAlgorithm)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmAverageToCells* New();
protected:
......@@ -43,7 +43,7 @@ protected:
~vtkmAverageToCells();
virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
private:
vtkmAverageToCells(const vtkmAverageToCells&) VTK_DELETE_FUNCTION;
......
......@@ -34,7 +34,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmAverageToPoints : public vtkDataSetAlgorith
{
public:
vtkTypeMacro(vtkmAverageToPoints,vtkDataSetAlgorithm)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmAverageToPoints* New();
protected:
......@@ -43,7 +43,7 @@ protected:
virtual int RequestData(vtkInformation *,
vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
vtkInformationVector *) override;
private:
vtkmAverageToPoints(const vtkmAverageToPoints&) VTK_DELETE_FUNCTION;
......
......@@ -37,7 +37,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmCleanGrid : public vtkUnstructuredGridAlgor
public:
vtkTypeMacro(vtkmCleanGrid, vtkUnstructuredGridAlgorithm)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmCleanGrid* New();
//@{
......@@ -55,9 +55,9 @@ protected:
vtkmCleanGrid();
~vtkmCleanGrid();
int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
int FillInputPortInformation(int, vtkInformation *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
vtkInformationVector *) override;
bool CompactPoints;
......
......@@ -38,7 +38,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmClip : public vtkUnstructuredGridAlgorithm
public:
static vtkmClip* New();
vtkTypeMacro(vtkmClip, vtkUnstructuredGridAlgorithm)
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* The scalar value to use when clipping the dataset. Values greater than
......@@ -62,16 +62,16 @@ public:
void SetClipFunction(vtkImplicitFunction *);
vtkGetObjectMacro(ClipFunction, vtkImplicitFunction);
vtkMTimeType GetMTime() VTK_OVERRIDE;
vtkMTimeType GetMTime() override;
protected:
vtkmClip();
~vtkmClip();
int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
int FillInputPortInformation(int port, vtkInformation* info) override;
double ClipValue;
bool ComputeScalars;
......
......@@ -40,7 +40,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmContour : public vtkContourFilter
{
public:
vtkTypeMacro(vtkmContour,vtkContourFilter)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmContour* New();
protected:
......@@ -48,7 +48,7 @@ protected:
~vtkmContour();
virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
private:
vtkmContour(const vtkmContour&) VTK_DELETE_FUNCTION;
......
......@@ -37,7 +37,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmExternalFaces : public vtkAlgorithm
{
public:
vtkTypeMacro(vtkmExternalFaces, vtkAlgorithm)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmExternalFaces* New();
/**
......@@ -65,11 +65,11 @@ protected:
vtkmExternalFaces();
~vtkmExternalFaces();
int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
int FillOutputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
int FillInputPortInformation(int, vtkInformation *) override;
int FillOutputPortInformation(int, vtkInformation *) override;
int ProcessRequest(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
virtual int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
......
......@@ -43,7 +43,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmExtractVOI : public vtkExtractVOI
{
public:
vtkTypeMacro(vtkmExtractVOI, vtkExtractVOI)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmExtractVOI* New();
protected:
......@@ -51,7 +51,7 @@ protected:
~vtkmExtractVOI();
int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
private:
vtkmExtractVOI(const vtkmExtractVOI&) VTK_DELETE_FUNCTION;
......
......@@ -40,7 +40,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmGradient : public vtkGradientFilter
{
public:
vtkTypeMacro(vtkmGradient, vtkGradientFilter)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmGradient* New();
protected:
......@@ -49,7 +49,7 @@ protected:
virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
private:
vtkmGradient(const vtkmGradient&) VTK_DELETE_FUNCTION;
......
......@@ -55,7 +55,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmLevelOfDetail : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkmLevelOfDetail,vtkPolyDataAlgorithm)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmLevelOfDetail* New();
// Description:
......@@ -88,7 +88,7 @@ protected:
~vtkmLevelOfDetail();
virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
private:
int NumberOfDivisions[3];
......
......@@ -49,7 +49,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmPolyDataNormals : public vtkPolyDataNormals
{
public:
vtkTypeMacro(vtkmPolyDataNormals, vtkPolyDataNormals)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmPolyDataNormals* New();
protected:
......@@ -57,7 +57,7 @@ protected:
~vtkmPolyDataNormals();
int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
private:
vtkmPolyDataNormals(const vtkmPolyDataNormals&) VTK_DELETE_FUNCTION;
......
......@@ -38,7 +38,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmThreshold : public vtkThreshold
{
public:
vtkTypeMacro(vtkmThreshold,vtkThreshold)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmThreshold* New();
......@@ -47,7 +47,7 @@ protected:
~vtkmThreshold();
virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
private:
vtkmThreshold(const vtkmThreshold&) VTK_DELETE_FUNCTION;
......
......@@ -55,7 +55,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmTriangleMeshPointNormals
{
public:
vtkTypeMacro(vtkmTriangleMeshPointNormals, vtkTriangleMeshPointNormals)
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkmTriangleMeshPointNormals* New();
protected:
......@@ -63,7 +63,7 @@ protected:
~vtkmTriangleMeshPointNormals();
int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
private:
vtkmTriangleMeshPointNormals(const vtkmTriangleMeshPointNormals&) VTK_DELETE_FUNCTION;
......
......@@ -25,11 +25,11 @@ public:
static @vtk-module@ObjectFactory * New();
vtkTypeMacro(@vtk-module@ObjectFactory, vtkObjectFactory)
const char * GetDescription() VTK_OVERRIDE { return "@vtk-module@ factory overrides."; }
const char * GetDescription() override { return "@vtk-module@ factory overrides."; }
const char * GetVTKSourceVersion() VTK_OVERRIDE;
const char * GetVTKSourceVersion() override;
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent) override;
protected:
@vtk-module@ObjectFactory();
......
......@@ -39,7 +39,7 @@ public:
static ContextTest *New();
vtkTypeMacro(ContextTest, vtkContextItem);
// Paint event for the chart, called whenever the chart needs to be drawn
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
bool Paint(vtkContext2D *painter) override;
};
//----------------------------------------------------------------------------
......
......@@ -39,7 +39,7 @@ public:
static ContextUnicode *New();
vtkTypeMacro(ContextUnicode, vtkContextItem);
// Paint event for the chart, called whenever the chart needs to be drawn
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
bool Paint(vtkContext2D *painter) override;
std::string FontFile;
};
......
......@@ -45,7 +45,7 @@ public:
}
void Execute( vtkObject *caller, unsigned long event,
void *vtkNotUsed(callData) ) VTK_OVERRIDE
void *vtkNotUsed(callData) ) override
{
vtkColorTransferFunction* self =
reinterpret_cast< vtkColorTransferFunction* >( caller );
......
......@@ -37,7 +37,7 @@ public:
static APIDiagram *New();
vtkTypeMacro(APIDiagram, vtkContextItem);
// Paint event for the chart, called whenever the chart needs to be drawn
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
bool Paint(vtkContext2D *painter) override;
};
//----------------------------------------------------------------------------
......
......@@ -69,7 +69,7 @@ class VTKCHARTSCORE_EXPORT vtkAxis : public vtkContextItem
{
public:
vtkTypeMacro(vtkAxis, vtkContextItem);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Enumeration of the axis locations in a conventional XY chart. Other
......@@ -507,12 +507,12 @@ public:
* Update the geometry of the axis. Takes care of setting up the tick mark
* locations etc. Should be called by the scene before rendering.
*/
void Update() VTK_OVERRIDE;
void Update() override;
/**
* Paint event for the axis, called whenever the axis needs to be drawn.
*/
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
bool Paint(vtkContext2D *painter) override;
/**
* Use this function to autoscale the axes after setting the minimum and
......@@ -585,7 +585,7 @@ public:
protected:
vtkAxis();
~vtkAxis() VTK_OVERRIDE;
~vtkAxis() override;
/**
* Update whether log scaling will be used for layout and rendering.
......
......@@ -37,7 +37,7 @@ class VTKCHARTSCORE_EXPORT vtkAxisExtended : public vtkObject
public:
vtkTypeMacro(vtkAxisExtended, vtkObject);
static vtkAxisExtended *New();
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method return a value to make step sizes corresponding to low q
......@@ -118,7 +118,7 @@ public:
protected:
vtkAxisExtended();
~vtkAxisExtended() VTK_OVERRIDE;
~vtkAxisExtended() override;
/**
* This method implements an exhaustive search of the legibilty parameters.
......
......@@ -55,13 +55,13 @@ public:
/**
* Paint the legend into a rectangle defined by the bounds.
*/
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
bool Paint(vtkContext2D *painter) override;
/**
* Compute and return the lower left corner of this legend, along
* with its width and height.
*/
vtkRectf GetBoundingRect(vtkContext2D* painter) VTK_OVERRIDE;
vtkRectf GetBoundingRect(vtkContext2D* painter) override;
//@{
/**
......@@ -102,7 +102,7 @@ public:
protected:
vtkCategoryLegend();
~vtkCategoryLegend() VTK_OVERRIDE;
~vtkCategoryLegend() override;
bool HasOutliers;
float TitleWidthOffset;
......
......@@ -45,7 +45,7 @@ class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem
{
public:
vtkTypeMacro(vtkChart, vtkContextItem);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Enum of the available chart types
......@@ -92,7 +92,7 @@ public:
/**
* Paint event for the chart, called whenever the chart needs to be drawn
*/
bool Paint(vtkContext2D *painter) VTK_OVERRIDE = 0;
bool Paint(vtkContext2D *painter) override = 0;
/**
* Add a plot to the chart, defaults to using the name of the y column
......@@ -367,7 +367,7 @@ public:
protected:
vtkChart();
~vtkChart() VTK_OVERRIDE;
~vtkChart() override;
/**
* Given the x and y vtkAxis, and a transform, calculate the transform that
......
......@@ -37,7 +37,7 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
{
public:
vtkTypeMacro(vtkChartBox, vtkChart);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a box chart
......@@ -49,12 +49,12 @@ public:
* The scene should take care of calling this on all items before their
* Paint function is invoked.
*/
void Update() VTK_OVERRIDE;
void Update() override;
/**
* Paint event for the chart, called whenever the chart needs to be drawn
*/
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
bool Paint(vtkContext2D *painter) override;
//@{
/**
......@@ -97,12 +97,12 @@ public:
/**
* Get the plot at the specified index, returns null if the index is invalid.
*/
vtkPlot* GetPlot(vtkIdType index) VTK_OVERRIDE;
vtkPlot* GetPlot(vtkIdType index) override;
/**
* Get the number of plots the chart contains.
*/
vtkIdType GetNumberOfPlots() VTK_OVERRIDE;
vtkIdType GetNumberOfPlots() override;
/**
* Get the chart Y axis
......@@ -128,22 +128,22 @@ public:
/**
* Return true if the supplied x, y coordinate is inside the item.
*/
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
bool Hit(const vtkContextMouseEvent &mouse) override;
/**
* Mouse move event.
*/
bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse button down event
*/
bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse button release event.
*/
bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) override;
/**
* Set the vtkTooltipItem object that will be displayed by the chart.
......@@ -165,7 +165,7 @@ public:
protected:
vtkChartBox();
~vtkChartBox() VTK_OVERRIDE;
~vtkChartBox() override;
//@{
/**
......
......@@ -37,7 +37,7 @@ class VTKCHARTSCORE_EXPORT vtkChartHistogram2D : public vtkChartXY
{
public:
vtkTypeMacro(vtkChartHistogram2D, vtkChartXY);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D histogram chart
......@@ -49,7 +49,7 @@ public:
* The scene should take care of calling this on all items before their
* Paint function is invoked.
*/
void Update() VTK_OVERRIDE;
void Update() override;
virtual void SetInputData(vtkImageData *data, vtkIdType z = 0);
virtual void SetTransferFunction(vtkScalarsToColors *function);
......@@ -57,16 +57,16 @@ public:
/**
* Return true if the supplied x, y coordinate is inside the item.
*/
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
bool Hit(const vtkContextMouseEvent &mouse) override;
/**
* Get the plot at the specified index, returns null if the index is invalid.
*/
vtkPlot* GetPlot(vtkIdType index) VTK_OVERRIDE;
vtkPlot* GetPlot(vtkIdType index) override;
protected:
vtkChartHistogram2D();
~vtkChartHistogram2D() VTK_OVERRIDE;
~vtkChartHistogram2D() override;
vtkSmartPointer<vtkPlotHistogram2D> Histogram;
......@@ -78,7 +78,7 @@ protected:
class Private;
Private* Storage;
bool UpdateLayout(vtkContext2D *painter) VTK_OVERRIDE;
bool UpdateLayout(vtkContext2D *painter) override;
private:
vtkChartHistogram2D(const vtkChartHistogram2D &) VTK_DELETE_FUNCTION;
......
......@@ -40,7 +40,7 @@ class VTKCHARTSCORE_EXPORT vtkChartLegend : public vtkContextItem
{
public:
vtkTypeMacro(vtkChartLegend, vtkContextItem);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Chart object.
......@@ -183,12 +183,12 @@ public:
* Update the geometry of the axis. Takes care of setting up the tick mark
* locations etc. Should be called by the scene before rendering.
*/
void Update() VTK_OVERRIDE;
void Update() override;
/**
* Paint event for the axis, called whenever the axis needs to be drawn.
*/
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
bool Paint(vtkContext2D *painter) override;
/**
* Request the space the legend requires to be drawn. This is returned as a
......@@ -230,26 +230,26 @@ public:
/**
* Return true if the supplied x, y coordinate is inside the item.
*/
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
bool Hit(const vtkContextMouseEvent &mouse) override;
/**
* Mouse move event.
*/
bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse button down event
*/
bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse button release event.
*/
bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) override;
protected:
vtkChartLegend();
~vtkChartLegend() VTK_OVERRIDE;
~vtkChartLegend() override;
float* Point; // The point the legend is anchored to.
int HorizontalAlignment; // Alignment of the legend to the point it is anchored to.
......
......@@ -39,7 +39,7 @@ class VTKCHARTSCORE_EXPORT vtkChartMatrix : public vtkAbstractContextItem
{
public:
vtkTypeMacro(vtkChartMatrix, vtkAbstractContextItem);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a new object.
......@@ -49,12 +49,12 @@ public:
/**
* Perform any updates to the item that may be necessary before rendering.
*/
void Update() VTK_OVERRIDE;
void Update() override;
/**
* Paint event for the chart matrix.
*/
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
bool Paint(vtkContext2D *painter) override;