Skip to content

Commit

Permalink
Replace VTK_OVERRIDE with override.
Browse files Browse the repository at this point in the history 
Now that VTK requires a C++11 compiler we can ditch using custom typedefs
  • Loading branch information
@kwrobot
kwrobot authored and Robert Maynard committed Oct 2, 2017
1 parent 6cec27f commit 657d021
Show file tree
Hide file tree
Showing 2,607 changed files with 13,728 additions and 13,737 deletions.
4 changes: 2 additions & 2 deletions Accelerators/Vtkm/vtkmAverageToCells.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ 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:
vtkmAverageToCells();
~vtkmAverageToCells();

virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;

private:
vtkmAverageToCells(const vtkmAverageToCells&) VTK_DELETE_FUNCTION;
Expand Down
4 changes: 2 additions & 2 deletions Accelerators/Vtkm/vtkmAverageToPoints.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -43,7 +43,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmAverageToPoints : public vtkDataSetAlgorith

virtual int RequestData(vtkInformation *,
vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
vtkInformationVector *) override;

private:
vtkmAverageToPoints(const vtkmAverageToPoints&) VTK_DELETE_FUNCTION;
Expand Down
6 changes: 3 additions & 3 deletions Accelerators/Vtkm/vtkmCleanGrid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();

//@{
Expand All @@ -55,9 +55,9 @@ class VTKACCELERATORSVTKM_EXPORT vtkmCleanGrid : public vtkUnstructuredGridAlgor
vtkmCleanGrid();
~vtkmCleanGrid();

int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
int FillInputPortInformation(int, vtkInformation *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
vtkInformationVector *) override;

bool CompactPoints;

Expand Down
8 changes: 4 additions & 4 deletions Accelerators/Vtkm/vtkmClip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -62,16 +62,16 @@ class VTKACCELERATORSVTKM_EXPORT vtkmClip : public vtkUnstructuredGridAlgorithm
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;
Expand Down
4 changes: 2 additions & 2 deletions Accelerators/Vtkm/vtkmContour.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ 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:
vtkmContour();
~vtkmContour();

virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;

private:
vtkmContour(const vtkmContour&) VTK_DELETE_FUNCTION;
Expand Down
8 changes: 4 additions & 4 deletions Accelerators/Vtkm/vtkmExternalFaces.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();

/**
Expand Down Expand Up @@ -65,11 +65,11 @@ class VTKACCELERATORSVTKM_EXPORT vtkmExternalFaces : public vtkAlgorithm
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 *);

Expand Down
4 changes: 2 additions & 2 deletions Accelerators/Vtkm/vtkmExtractVOI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ 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:
vtkmExtractVOI();
~vtkmExtractVOI();

int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;

private:
vtkmExtractVOI(const vtkmExtractVOI&) VTK_DELETE_FUNCTION;
Expand Down
4 changes: 2 additions & 2 deletions Accelerators/Vtkm/vtkmGradient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -49,7 +49,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmGradient : public vtkGradientFilter


virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;

private:
vtkmGradient(const vtkmGradient&) VTK_DELETE_FUNCTION;
Expand Down
4 changes: 2 additions & 2 deletions Accelerators/Vtkm/vtkmLevelOfDetail.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -88,7 +88,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmLevelOfDetail : public vtkPolyDataAlgorithm
~vtkmLevelOfDetail();

virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;

private:
int NumberOfDivisions[3];
Expand Down
4 changes: 2 additions & 2 deletions Accelerators/Vtkm/vtkmPolyDataNormals.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ 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:
vtkmPolyDataNormals();
~vtkmPolyDataNormals();

int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;

private:
vtkmPolyDataNormals(const vtkmPolyDataNormals&) VTK_DELETE_FUNCTION;
Expand Down
4 changes: 2 additions & 2 deletions Accelerators/Vtkm/vtkmThreshold.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -47,7 +47,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmThreshold : public vtkThreshold
~vtkmThreshold();

virtual int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;

private:
vtkmThreshold(const vtkmThreshold&) VTK_DELETE_FUNCTION;
Expand Down
4 changes: 2 additions & 2 deletions Accelerators/Vtkm/vtkmTriangleMeshPointNormals.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ 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:
vtkmTriangleMeshPointNormals();
~vtkmTriangleMeshPointNormals();

int RequestData(vtkInformation*, vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;

private:
vtkmTriangleMeshPointNormals(const vtkmTriangleMeshPointNormals&) VTK_DELETE_FUNCTION;
Expand Down
6 changes: 3 additions & 3 deletions CMake/vtkObjectFactory.h.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Charts/Core/Testing/Cxx/TestContext.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ContextTest : public vtkContextItem
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;
};

//----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion Charts/Core/Testing/Cxx/TestContextUnicode.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ContextUnicode : public vtkContextItem
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;
};

Expand Down
2 changes: 1 addition & 1 deletion Charts/Core/Testing/Cxx/TestControlPointsItemEvents.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class vtkTFCallback : public vtkCommand
}

void Execute( vtkObject *caller, unsigned long event,
void *vtkNotUsed(callData) ) VTK_OVERRIDE
void *vtkNotUsed(callData) ) override
{
vtkColorTransferFunction* self =
reinterpret_cast< vtkColorTransferFunction* >( caller );
Expand Down
2 changes: 1 addition & 1 deletion Charts/Core/Testing/Cxx/TestDiagram.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class APIDiagram : public vtkContextItem
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;
};

//----------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions Charts/Core/vtkAxis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -507,12 +507,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.
*/
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
Expand Down Expand Up @@ -585,7 +585,7 @@ class VTKCHARTSCORE_EXPORT vtkAxis : public vtkContextItem

protected:
vtkAxis();
~vtkAxis() VTK_OVERRIDE;
~vtkAxis() override;

/**
* Update whether log scaling will be used for layout and rendering.
Expand Down
4 changes: 2 additions & 2 deletions Charts/Core/vtkAxisExtended.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -118,7 +118,7 @@ class VTKCHARTSCORE_EXPORT vtkAxisExtended : public vtkObject

protected:
vtkAxisExtended();
~vtkAxisExtended() VTK_OVERRIDE;
~vtkAxisExtended() override;

/**
* This method implements an exhaustive search of the legibilty parameters.
Expand Down
6 changes: 3 additions & 3 deletions Charts/Core/vtkCategoryLegend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ class VTKCHARTSCORE_EXPORT vtkCategoryLegend: public vtkChartLegend
/**
* 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;

//@{
/**
Expand Down Expand Up @@ -102,7 +102,7 @@ class VTKCHARTSCORE_EXPORT vtkCategoryLegend: public vtkChartLegend

protected:
vtkCategoryLegend();
~vtkCategoryLegend() VTK_OVERRIDE;
~vtkCategoryLegend() override;

bool HasOutliers;
float TitleWidthOffset;
Expand Down
6 changes: 3 additions & 3 deletions Charts/Core/vtkChart.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -92,7 +92,7 @@ class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem
/**
* 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
Expand Down Expand Up @@ -367,7 +367,7 @@ class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem

protected:
vtkChart();
~vtkChart() VTK_OVERRIDE;
~vtkChart() override;

/**
* Given the x and y vtkAxis, and a transform, calculate the transform that
Expand Down
Loading

0 comments on commit 657d021

Please sign in to comment.