Convert vtk over to using VTK_OVERRIDE

CMake/vtkObjectFactory.h.in

@@ -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();

Charts/Core/vtkAxis.h

@@ -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 @@ class VTKCHARTSCORE_EXPORT vtkAxis : public vtkContextItem
    * 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 @@ class VTKCHARTSCORE_EXPORT vtkAxis : public vtkContextItem
 
 protected:
   vtkAxis();
-  ~vtkAxis();
+  ~vtkAxis() VTK_OVERRIDE;
 
   /**
    * Update whether log scaling will be used for layout and rendering.

Charts/Core/vtkAxisExtended.h

@@ -118,7 +118,7 @@ class VTKCHARTSCORE_EXPORT vtkAxisExtended : public vtkObject
 
 protected:
   vtkAxisExtended();
-  ~vtkAxisExtended();
+  ~vtkAxisExtended() VTK_OVERRIDE;
 
   /**
    * This method implements an exhaustive search of the legibilty parameters.

Charts/Core/vtkCategoryLegend.h

@@ -55,13 +55,13 @@ class VTKCHARTSCORE_EXPORT vtkCategoryLegend: public vtkChartLegend
   /**
    * 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 @@ class VTKCHARTSCORE_EXPORT vtkCategoryLegend: public vtkChartLegend
 
 protected:
   vtkCategoryLegend();
-  virtual ~vtkCategoryLegend();
+  ~vtkCategoryLegend() VTK_OVERRIDE;
 
   bool                                HasOutliers;
   float                               TitleWidthOffset;

Charts/Core/vtkChart.h

@@ -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 @@ class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem
   /**
    * 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 @@ class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem
 
 protected:
   vtkChart();
-  ~vtkChart();
+  ~vtkChart() VTK_OVERRIDE;
 
   /**
    * Given the x and y vtkAxis, and a transform, calculate the transform that

Charts/Core/vtkChartBox.h

@@ -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 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
    * 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 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
   /**
    * 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 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
   /**
    * 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 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
 
 protected:
   vtkChartBox();
-  ~vtkChartBox();
+  ~vtkChartBox() VTK_OVERRIDE;
 
   //@{
   /**

Charts/Core/vtkChartHistogram2D.h

@@ -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,24 +49,24 @@ class VTKCHARTSCORE_EXPORT vtkChartHistogram2D : public vtkChartXY
    * 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);
 
   /**
    * 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 @@ class VTKCHARTSCORE_EXPORT vtkChartHistogram2D : public vtkChartXY
   class Private;
   Private* Storage;
 
-  virtual bool UpdateLayout(vtkContext2D *painter);
+  bool UpdateLayout(vtkContext2D *painter) VTK_OVERRIDE;
 
 private:
   vtkChartHistogram2D(const vtkChartHistogram2D &) VTK_DELETE_FUNCTION;

Charts/Core/vtkChartLegend.h

@@ -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 @@ class VTKCHARTSCORE_EXPORT vtkChartLegend : public vtkContextItem
    * 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 @@ class VTKCHARTSCORE_EXPORT vtkChartLegend : public vtkContextItem
   /**
    * 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;
 
 protected:
   vtkChartLegend();
-  ~vtkChartLegend();
+  ~vtkChartLegend() VTK_OVERRIDE;
 
   float* Point;  // The point the legend is anchored to.
   int HorizontalAlignment; // Alignment of the legend to the point it is anchored to.

Charts/Core/vtkChartMatrix.h

@@ -39,7 +39,7 @@ class VTKCHARTSCORE_EXPORT vtkChartMatrix : public vtkAbstractContextItem
 {
 public:
   vtkTypeMacro(vtkChartMatrix, vtkAbstractContextItem);
-  virtual void PrintSelf(ostream &os, vtkIndent indent);
+  void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
 
   /**
    * Creates a new object.
@@ -49,12 +49,12 @@ class VTKCHARTSCORE_EXPORT vtkChartMatrix : public vtkAbstractContextItem
   /**
    * Perform any updates to the item that may be necessary before rendering.
    */
-  virtual void Update();
+  void Update() VTK_OVERRIDE;
 
   /**
    * Paint event for the chart matrix.
    */
-  virtual bool Paint(vtkContext2D *painter);
+  bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
 
   /**
    * Set the width and height of the chart matrix. This will cause an immediate
@@ -149,7 +149,7 @@ class VTKCHARTSCORE_EXPORT vtkChartMatrix : public vtkAbstractContextItem
 
 protected:
   vtkChartMatrix();
-  ~vtkChartMatrix();
+  ~vtkChartMatrix() VTK_OVERRIDE;
 
   class PIMPL;
   PIMPL *Private;