Commit 3f7a2769 authored by Robert Maynard's avatar Robert Maynard

Convert vtk over to using VTK_OVERRIDE

parent a182b3a6

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -25,11 +25,11 @@ public:
static @vtk-module@ObjectFactory * New();
vtkTypeMacro(@vtk-module@ObjectFactory, vtkObjectFactory)
const char * GetDescription() { return "@vtk-module@ factory overrides."; }
const char * GetDescription() VTK_OVERRIDE { return "@vtk-module@ factory overrides."; }
const char * GetVTKSourceVersion();
const char * GetVTKSourceVersion() VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
protected:
@vtk-module@ObjectFactory();
......
......@@ -69,7 +69,7 @@ class VTKCHARTSCORE_EXPORT vtkAxis : public vtkContextItem
{
public:
vtkTypeMacro(vtkAxis, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Enumeration of the axis locations in a conventional XY chart. Other
......@@ -499,12 +499,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.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the axis, called whenever the axis needs to be drawn.
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
/**
* Use this function to autoscale the axes after setting the minimum and
......@@ -577,7 +577,7 @@ public:
protected:
vtkAxis();
~vtkAxis();
~vtkAxis() VTK_OVERRIDE;
/**
* Update whether log scaling will be used for layout and rendering.
......
......@@ -118,7 +118,7 @@ public:
protected:
vtkAxisExtended();
~vtkAxisExtended();
~vtkAxisExtended() VTK_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.
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
/**
* Compute and return the lower left corner of this legend, along
* with its width and height.
*/
virtual vtkRectf GetBoundingRect(vtkContext2D* painter);
vtkRectf GetBoundingRect(vtkContext2D* painter) VTK_OVERRIDE;
//@{
/**
......@@ -102,7 +102,7 @@ public:
protected:
vtkCategoryLegend();
virtual ~vtkCategoryLegend();
~vtkCategoryLegend() VTK_OVERRIDE;
bool HasOutliers;
float TitleWidthOffset;
......
......@@ -45,7 +45,7 @@ class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem
{
public:
vtkTypeMacro(vtkChart, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Enum of the available chart types
......@@ -90,7 +90,7 @@ public:
/**
* Paint event for the chart, called whenever the chart needs to be drawn
*/
virtual bool Paint(vtkContext2D *painter) = 0;
bool Paint(vtkContext2D *painter) VTK_OVERRIDE = 0;
/**
* Add a plot to the chart, defaults to using the name of the y column
......@@ -365,7 +365,7 @@ public:
protected:
vtkChart();
~vtkChart();
~vtkChart() VTK_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);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_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.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the chart, called whenever the chart needs to be drawn
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
//@{
/**
......@@ -97,12 +97,12 @@ public:
/**
* Get the plot at the specified index, returns null if the index is invalid.
*/
virtual vtkPlot* GetPlot(vtkIdType index);
vtkPlot* GetPlot(vtkIdType index) VTK_OVERRIDE;
/**
* Get the number of plots the chart contains.
*/
virtual vtkIdType GetNumberOfPlots();
vtkIdType GetNumberOfPlots() VTK_OVERRIDE;
/**
* Get the chart Y axis
......@@ -128,22 +128,22 @@ public:
/**
* Return true if the supplied x, y coordinate is inside the item.
*/
virtual bool Hit(const vtkContextMouseEvent &mouse);
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse move event.
*/
virtual bool MouseMoveEvent(const vtkContextMouseEvent &mouse);
bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button down event
*/
virtual bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button release event.
*/
virtual bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Set the vtkTooltipItem object that will be displayed by the chart.
......@@ -165,7 +165,7 @@ public:
protected:
vtkChartBox();
~vtkChartBox();
~vtkChartBox() VTK_OVERRIDE;
//@{
/**
......
......@@ -37,7 +37,7 @@ class VTKCHARTSCORE_EXPORT vtkChartHistogram2D : public vtkChartXY
{
public:
vtkTypeMacro(vtkChartHistogram2D, vtkChartXY);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_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.
*/
virtual void Update();
void Update() VTK_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.
*/
virtual bool Hit(const vtkContextMouseEvent &mouse);
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Get the plot at the specified index, returns null if the index is invalid.
*/
virtual vtkPlot* GetPlot(vtkIdType index);
vtkPlot* GetPlot(vtkIdType index) VTK_OVERRIDE;
protected:
vtkChartHistogram2D();
~vtkChartHistogram2D();
~vtkChartHistogram2D() VTK_OVERRIDE;
vtkSmartPointer<vtkPlotHistogram2D> Histogram;
......@@ -78,7 +78,7 @@ protected:
class Private;
Private* Storage;
virtual bool UpdateLayout(vtkContext2D *painter);
bool UpdateLayout(vtkContext2D *painter) VTK_OVERRIDE;
private:
vtkChartHistogram2D(const vtkChartHistogram2D &) VTK_DELETE_FUNCTION;
......
......@@ -40,7 +40,7 @@ class VTKCHARTSCORE_EXPORT vtkChartLegend : public vtkContextItem
{
public:
vtkTypeMacro(vtkChartLegend, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_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.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the axis, called whenever the axis needs to be drawn.
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_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.
*/
virtual bool Hit(const vtkContextMouseEvent