Replace VTK_OVERRIDE with override.

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

Accelerators/Vtkm/vtkmAverageToCells.h

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

Accelerators/Vtkm/vtkmAverageToPoints.h

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

Accelerators/Vtkm/vtkmCleanGrid.h

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

Accelerators/Vtkm/vtkmClip.h

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

Accelerators/Vtkm/vtkmContour.h

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

Accelerators/Vtkm/vtkmExternalFaces.h

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

Accelerators/Vtkm/vtkmExtractVOI.h

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

Accelerators/Vtkm/vtkmGradient.h

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

Accelerators/Vtkm/vtkmLevelOfDetail.h

@@ -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];

Accelerators/Vtkm/vtkmPolyDataNormals.h

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

Accelerators/Vtkm/vtkmThreshold.h

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

Accelerators/Vtkm/vtkmTriangleMeshPointNormals.h

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

CMake/vtkObjectFactory.h.in

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

Charts/Core/Testing/Cxx/TestContext.cxx

@@ -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;
 };
 
 //----------------------------------------------------------------------------

Charts/Core/Testing/Cxx/TestContextUnicode.cxx

@@ -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;
 };
 

Charts/Core/Testing/Cxx/TestControlPointsItemEvents.cxx

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

Charts/Core/Testing/Cxx/TestDiagram.cxx

@@ -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;
 };
 
 //----------------------------------------------------------------------------

Charts/Core/vtkAxis.h

@@ -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.

Charts/Core/vtkAxisExtended.h

@@ -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.

Charts/Core/vtkCategoryLegend.h

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